Ha more cleanup

FIrst commit needed to un-break master.  The others should help ensure ordering, especially in the fencing_type = 'disabled' case.