selinux: Don't reset inherited system-wide configs
Merge branch 'cm' into HEAD