merged fix for STANBOL-1206 and STANBOL-1207 to the 0.12.0 releaseing branch

git-svn-id: https://svn.apache.org/repos/asf/stanbol/branches/release-0.12@1539369 13f79535-47bb-0310-9956-ffa450edef68