Merge "Bug-1928:TestDriver, fix stop and reinstateNode"