Merge branch 'master' into ha-feature-trusty

Conflicts:
	ci_environment/elasticsearch/attributes/default.rb
	ci_environment/golang/attributes/default.rb
	ci_environment/php/attributes/default.rb