import form master branch
master branch for deployments @ICM
beta
some java8 refactorings, added more tests for the software entities mapping
implemented use of opt in/out rules for entity fields (#2557).depending on specific solrj version (thus excluding cdh6.X versions)
codebase used to migrate to java8 the production system