UIMA-3850 merged changes suggested by watson core group. Cosmetic changes to simplify code

git-svn-id: https://svn.apache.org/repos/asf/uima/uima-as/trunk@1599664 13f79535-47bb-0310-9956-ffa450edef68