Update definisions
Update cookbook
Update .lock file
Merge branch 'feature-fix-cookbook'

Conflicts:
	definitions/centos-64/base.sh