Record cephx being the default in the attributes.
If cephx is explicitly disabled, then don't generate the keys
Merge branch 'skip-cephx-if-disabled2' into cdmaster

Conflicts:
	recipes/mon.rb
	recipes/osd.rb