Merge "Switch remaining json import to oslo_serialization"