[UIMA-3969] fixup whitespace (no real change except some formatting)

git-svn-id: https://svn.apache.org/repos/asf/uima/uimaj/branches/2.6.0-json@1617581 13f79535-47bb-0310-9956-ffa450edef68
[UIMA-3969] merge from trunk prior to remerging branch - only a property changed

git-svn-id: https://svn.apache.org/repos/asf/uima/uimaj/branches/2.6.0-json@1617589 13f79535-47bb-0310-9956-ffa450edef68