[UIMA-3969] merge from branch/2.6.0-json back into trunk

git-svn-id: https://svn.apache.org/repos/asf/uima/uimaj/trunk@1617593 13f79535-47bb-0310-9956-ffa450edef68