Merge "Remove ODL and ONOS from base scenarios"