define and enable solr feature
Merge branch 'master' of https://github.com/c2corg/infrastructure into haproxy-https