Merge branch 'master' into monitored_client_interface

Conflicts:
	README.md
	attributes/server.rb
	recipes/client.rb
	templates/default/hosts.cfg.erb

Change-Id: Ie03c749134b17bebaaabc54c4aadd5904e896100