Merge pull request #680 from Capgemini/elk

Add elk to apollo

Merge branch 'devel'

Merge pull request #630 from pra85/patch-1

Fix a typo

Merge pull request #568 from Capgemini/vault-tests-fix

Fix vault spec test

Merge pull request #518 from ravbaba/upgrade-docker-version-on-bastio…

…n-host

Upgrading docker version on bastion host - issue #505

Merge pull request #433 from Capgemini/bastion-deploy-fix

Bastion deploy fix

Merge pull request #351 from Capgemini/weave-bridge-fix

Fix #342 - Weave network instability

Merge pull request #335 from ravbaba/changes_variables_in_ansible_roles

Changes variables in ansible roles

Merge pull request #262 from Capgemini/255-weave-upgrade

#255 - upgrade weave to v0.11.2

Merge pull request #208 from Capgemini/weave-spec-tests

#180 - Add weave spec tests