fixes STANBOL-1322 in trunk. Much less changes as for the 0.12 branch as a lot of adaptions where already done wile working on 1.0.0

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