selinux: merge caf commit