Merge branch 'master' of http://oss.tresys.com/git/refpolicy
Conflicts:
policy/modules/admin/rpm.if
policy/modules/admin/shutdown.fc
policy/modules/admin/shutdown.te
policy/modules/kernel/corenetwork.te.in
policy/modules/roles/staff.te
policy/modules/roles/unprivuser.te
policy/modules/system/unconfined.te
policy/modules/system/userdomain.if