More SELinux updates

Conflicts:
	selinux/file_contexts