[BUGFIX] Solr Cookbook

* Adds java7 tests
* Cleanup

Change-Id: I89b03c12fb3089ad9ba36d8c2171354e24f50136
Resolves: #8334
[TASK] Raises versionnumber
[TASK] Generates ChangeLog
Merge branch 'release/1.1.5' into develop
Merge pull request #3 from phbergsmann/develop

Adds java7 to integration tests, cleans up the code