integrated changes from trunk related to the incremental transformation for projects and orgs
solr7
codebase used to migrate to java8 the production system