Merge "When node disconnects from master controller, no node takes over"