ensure that the transactions are closed as part of the FAILOVER before doing a MOVE SET

There were some code paths that could leave a transaction open such that when we later
got to a second set or node the LOCK SET could fail.

Also remove an unused if condition