Removed trapping.blacklist and removed old params from pf.conf.defaults
Merge branch 'feature/catalyst-admin' of https://github.com/inverse-inc/packetfence into feature/catalyst-admin