Remove stray # in comments
Merge branch 'skip-cephx-if-disabled2' into cdmaster