merged down trunk changes in celi

git-svn-id: https://svn.apache.org/repos/asf/stanbol/branches/commons-ng@1516106 13f79535-47bb-0310-9956-ffa450edef68