Sync config upgrade code with HEAD
Sync config upgrade code with HEAD

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