[UIMA-1838] merge uimaj trunk -> branch to pick up any updates (none found)

git-svn-id: https://svn.apache.org/repos/asf/uima/uimaj/branches/depend-on-july-9-build-tools@964465 13f79535-47bb-0310-9956-ffa450edef68