merged fixes for STANBOL-1349 and STANBOL-1350 to trunk

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