Bug 6587: Retain state when transitioning between Leader and IsolatedLeader