More add field tests; json escaped double quotes -> single + json() wrapper (merged trunk r1537399)

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/branch_4x@1537400 13f79535-47bb-0310-9956-ffa450edef68