Revert "Revert "Add capability and unit testing for a blocking switch to manual mode from Serengeti""
Put the "blocking switch" code back in...

This reverts commit 0664e349ddababa5d980fab141e4b21f7a83bf6e.