Change json unit tests to include the shims since that is what they are testing. Fix #2533150
Merge remote-tracking branch 'upstream/dev-3.x' into dev-3.x