Fixed apachesolr module name - disabled when running tests to avoid indexing test items
Merge branch 'develop' of https://github.com/eu-osha/osha-website into develop