Cleaned up and merged some of the partial classes for Json to reduce the number of partials.
Changed the way some values are retrieved when creating patches for typed json, part of solution for issue #1591
Merge branch 'issue/1591' into develop