Merge "Remove old ODL+OpenStack content"