STANBOL-1094: re-added remaining STANBOL-1132 related changes to the trunk

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