Merge "Reflect removal of vndservice_manager SELinux object manager." into oc-dev