Configuration option to say whether grants statements run at all
Merge branch 'master' into remove-databag-reliance

Conflicts:
	recipes/replication.rb