Fix merge conflicts
Fix merge conflicts


Former-commit-id: aa591cd08203ed71091f4873e45434b9573b3d2e
L-MA/libcalico,robbrockbank/libcalico,plwhite/libcalico,TrimBiggs/libnetwork-plugin,Symmetric/libcalico,alexhersh/libcalico,djosborne/libcalico,projectcalico/libnetwork-plugin,caseydavenport/libcalico,tomdee/libnetwork-plugin,insequent/libcalico,TrimBiggs/libcalico,TrimBiggs/libnetwork-plugin,projectcalico/libcalico,tomdee/libcalico