Bug-1928:TestDriver, fix stop and reinstateNode

Change-Id: I115da9b5b32b3e1a71f04bc2185df1d15e1ac205
Signed-off-by: Kamal Rameshan <kramesha@cisco.com>
Merge "Bug-1928:TestDriver, fix stop and reinstateNode"