Merge "Avoid SELinux violation at vndservicemanager" into oc-dr1-dev