Fixed 2 Bugs.
1370263 : allow family inet6-vpn to be be configured for control nodes and bgp
peers.
1366408: allow family e-vpn to be be configured for bgp peers.

Change-Id: I8bde8ad21ef5397d314fe010faa0c5c3fb9fd183