Synchronize power-save module better with scheduler

Synchronize power-save module better with scheduler.
Without this change, returning a node to service was typically
delayed longer than necessary.
Patch from Andriy Grytsenko (Massive Solutions Limited).