Merge "Skip 'test_delete_flavor_service_profile'"