separated out named and ip bgp peers
manually merged in luis's changes
fixed null-pointer exception in peer group assignment
added isp switchover test rigs
Merge branch 'unstable' into pakka