Merge "Change floating ips management from nova to neutron"