Merge pull request #3583 from iwasakims/STORM-3984

STORM-3984: Nimbus failover causes unnecessary reassign if 600s are passed after starting Nimbus.