Updated from global requirements

Change-Id: I2e22d529892a1a15aa300b9904362cf491fd8064
Optimize floating IP status update

Hopefully also avoid tracebacks due to nested transactions
being rolled back

Change-Id: I1e74fb8d90de09b53d330f499b93073f19a5b9bf
Closes-Bug: #1290549
Merge "Updated from global requirements"
Merge "Optimize floating IP status update"