STANBOL-660; STANBOL-488: merged changes of rev. 1596518 to trunk

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