merged STANBOL-1254 to 0.12

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