merged implementation of STANBOL-1262 and STANBOL-1266 for the 0.12 branch to trunk.

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