Merge remote-tracking branch 'origin/cmaster' into cmaster-next

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc bgpd/bgp_vty.c
Simple merge

diff --cc configure.ac
Simple merge

diff --cc lib/plist.c
index 336c55a08498e6f9716b6af0ba7e798adbaaf14f,87d46a1054eb3e3caf14afbfe9a6c4289c645bf4..cab5d0dba9e451d7bd8204da8e26fe59cc2981cb
--- 1/lib/plist.c
--- 2/lib/plist.c
+++ b/lib/plist.c
@@@ -962,11 -962,11 +967,16 @@@ vty_prefix_list_install (struct vty *vt
          vty_out (vty, "%% Malformed IPv6 prefix%s", VTY_NEWLINE);
          return CMD_WARNING;
        }
+ 
+       /* make a copy to verify prefix matches mask length */
+       prefix_copy (&p_tmp, &p);
+       apply_mask_ipv6 ((struct prefix_ipv6 *) &p_tmp);
+ 
 +      break;
 +    case AFI_ETHER:
 +    default:
 +      vty_out (vty, "%% Unrecognized AFI (%d)%s", afi, VTY_NEWLINE);
 +      return CMD_WARNING;
        break;
      }