Merge "Always allow Ethernet to be an upstream" into oc-dr1-dev