Merge "remove oc test for xenial"