[UIMA-1832] merge trunk -> branch (picked up on change in cas editor : AnnotationStyleTest - but diff shows no diff except white space maybe)

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