Merge http://oss.tresys.com/git/refpolicy-contrib into master_contrib_merge
Conflicts:
bcfg2.fc
bcfg2.if
bcfg2.te
blueman.fc
blueman.if
blueman.te
gpg.te
kerberos.te
nagios.te
nslcd.te
postfix.te
samba.te
sssd.te
telepathy.if
telnet.te
virt.if
zarafa.te