Node down support; refactor prepareCommit

Change-Id: Iafd976015b34ff9bed1e655bf0db05317d3574c4
Merge "Node down support; refactor prepareCommit"