STANBOL-966: Commit if the patch version 6; Also includes current state of STANBOL-980

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