merged implementation for STANBOL-1399 and STANBOL-1400 to trunk

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