Merge "Revert "Install odl-mdsal-trace in netvirt oxygen csit""