merged fixes for STANBOL-1339 and STANBOL-1340 to trunk

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