Merge pull request #551 from david22swan/devel-user
(MODULES-10413) Allow custom ntp user and daemon options