integrated changes from trunk related to the incremental transformation for projects and orgs
solr7
integrated (hopefully) all required changes from dnet40
codebase used to migrate to java8 the production system