OAK-1475 - adjusted scr annotations
OAK-1475 - avoided dependency from solrj in oak-solr-osgi, minor improvements to oak-solr-core pom