cleanup (main tree)
Update on selinux-base-policy and patchbundle references