MODULES-1389 Add ability to specify NoRestart, default behavior remains, added tests