Updated openstack/openstack
Project: openstack/neutron  b3515612ce9d3d525fbcdce4187f9ec97bec4df3

Fixed dhcp & gateway ip conflict in PLUMgrid plugin

   * Adjust dhcp IP if conflicts with gateway IP
   * Added unit test case

Closes-Bug:1333442
Change-Id: Iaa4e63faf28b783e6b5dbc50035ca50ccde9951a