[1.7.x] Refactor CustomJsonLayout, and test it locally#1200

jdcasey merged 5 commits intoCommonjava:indy-1.7.xCommonjava/indy:indy-1.7.xfrom

jdcasey:indy-1.7.xjdcasey/indy:indy-1.7.xCopy head branch name to clipboard