MODULES-1389 Add ability to specify NoRestart both enable and disable.