Merge "Fixing test_volume_boot_pattern when use_floatingip_for_ssh=false"