Network fixes, control_node selection fixes

Change-Id: Ic349ccb92e1ea54fe2be8f0ca4bfe7bd0ebed379