Merge "Return gateway node to new OS OVS labs"