Merge commit 'b0e3ba6c7a017c0bf20f66c86eb6f727567a3096' into bskyb/candidates/v180

Conflicts:
	Gemfile.lock
	Vagrantfile
	spec/unit/container/container_spec.rb