* same changes from [6378] to the changes adopted in [6297] * cleanup comments
* same changes from [6378] to the changes adopted in [6297]
* cleanup comments

Ticket #540

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