Match bgp and xmpp neighbors in introspect by name or address

Change-Id: Iea2e5aa527f4c56c01974ed45ea226a1410b0e63