Should expect control_data ip for bgp peer.
Merge pull request #385 from Juniper/ijohnson_test_fix

Should expect control_data ip for bgp peer.