[UIMA-2498] merge in from trunk (nothing merged)

git-svn-id: https://svn.apache.org/repos/asf/uima/uimaj/branches/filteredCompress-uima-2498@1462251 13f79535-47bb-0310-9956-ffa450edef68