Merge "Add floating IP waiter"