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

Fix vault spec test

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

…on-bastion-host

Upgrading docker version on bastion host - issue Capgemini#505

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

Bastion deploy fix

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

Fix Capgemini#342 - Weave network instability

Merge pull request Capgemini#335 from ravbaba/changes_variables_in_an…

…sible_roles

Changes variables in ansible roles

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

Capgemini#255 - upgrade weave to v0.11.2

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

Capgemini#180 - Add weave spec tests

Merge branch 'master' of https://github.com/Capgemini/Apollo