STANBOL-1222 STANBOL-1223: Code clean up and RAT conformance changes

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