nanny: reset fsm on rearm
Merge pull request #404 from pwieczorkiewicz/nanny-reset2