Merge "Fix error codes for test_delete_flavor_service_profile"