applied patch for STANBOL-1310 with some additional changes (see issue for details)

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