merged fixes for STANBOL-1257 and STANBOL-1258 to trunk

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