Merge "Hopefully fix funky SELinux labels." into oc-dev