Pulling from gerrit/master

Conflicts:
	cookbooks/vayacondios/attributes/default.rb

Change-Id: I0bdd5a311267eff64d1fa5cb6f7adcc417868f9c