Merge "Switch all uses of json to oslo_serialization"