Merge "Bug 2362: Make sure JSON and XML codecs are not losing constraints."