Rework to support new MaintainNode behavior

Fixed the testcases to do proper cleanup
Executor starts once we have presence.
Rework how stop is handled.  Attempt to make it more sane.