- generalize CONFLICTS; - fix subtle bug in my patch-vtysh.c; - fix call to getgrouplist() function, this part based on submission by Alexander Mitrokhin. Bump PORTREVISION.