Merge "Sync Patch and PatchObject fixtures from oslo-incubator"