calico-felix overrides being set for calico-dhcp-agent and vice versa. Change-Id: I7befae6268ca77adb462a3a06d1dcf59b277eea2