Applied the patch for STANBOL-1317 with two modifications reflection recent changes in the 0.12 branch

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