merged r1597575 to trunk (impl for STANBOL-1334; STANBOL-1346)

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