Fixed dhcp & gateway ip conflict in PLUMgrid plugin

Changes approved in community. Ready to merge here: https://review.openstack.org/#/c/102654/