merged implementations for STANBOL-488 and STANBOL-1287 from the 0.12 branch to trunk. With this commit the EnhancementProperties support for 0.12.1 and 1.0.0 is in sync (merged revisions: 1571146, 1571150, 1572586, 1593490 and 1594134)

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