UIMA-3731 Restore UIMA-3371 changes lost in SM rework

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