[UIMA-1832] merge trunk -> branch (no changes except for recording merge info)

git-svn-id: https://svn.apache.org/repos/asf/uima/build/branches/depend-on-parent-pom-4@961735 13f79535-47bb-0310-9956-ffa450edef68