Merge "Fix test_rebuild_server test by waiting for floating ip"