merged changes for STANBOL-1321 from 0.12 to trunk

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