Added configuration of Elasticsearch and fixes for Apache
Merge branch 'refs/heads/f/ansible' into r/3.1.x