Backout patches from Ticket #1068
Backout patches from Ticket #1068

NOYB/pfsense,pfsense/pfsense,ptorsten/pfsense,ch1c4um/pfsense,ptorsten/pfsense,NewEraCracker/pfsense,ch1c4um/pfsense,jxmx/pfsense,NOYB/pfsense,dennypage/pfsense,NewEraCracker/pfsense,jxmx/pfsense,BlackstarGroup/pfsense,dennypage/pfsense,NewEraCracker/pfsense,phil-davis/pfsense,BlackstarGroup/pfsense,phil-davis/pfsense,phil-davis/pfsense,dennypage/pfsense,NewEraCracker/pfsense,ch1c4um/pfsense,pfsense/pfsense,dennypage/pfsense,pfsense/pfsense,brunostein/pfsense,brunostein/pfsense,BlackstarGroup/pfsense,BlackstarGroup/pfsense,ch1c4um/pfsense,ptorsten/pfsense,jxmx/pfsense,phil-davis/pfsense,pfsense/pfsense,NOYB/pfsense,brunostein/pfsense