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

Be so glad when this section is no longer required.