merged updates to STANBOL-1397 from trunk to 0.12.1 branch

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