Merge "Fix flavor NotFound in test_resize_server_revert_deleted_flavor"