merged implementation for STANBOL-1391 from 0.12.1 to trunk

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