Refactor XSiteStateTransferManagerImpl to make it easier to implement the conflict resolution.

Bonus: make the following methods non-blocking: state transfer ack (notifyStatePushFinished) & topology update (onTopologyUpdated). Other methods are invoked from use input (JMX).