merged fixes for STANBOL-1240, STANBOL-1241 and STANBOL-1242 from 0.12 to 1.0.0

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