Be smarter about combinations of combinedfields and usecolspan2
Be smarter about combinations of combinedfields and usecolspan2

a) When we are doing combined fields and usecolspan2 is in effect, then usecolspan2 is also a signal that we want to spread the combined fields horizontally in a single row. In that case we want the combined fields to all be in a single "tr" tag enclosing them all. That was already working in that way.
b) But if usecolspan2 is NOT in effect, then we want the combined fields to still run "together" but vertically under each other. In this case we want each field to be in its own "tr" tag.

This change makes (b) happen.

If combinedfields is not set, then each of the "if" tests here still follows the same path it did previously, so there should be no effect on the HTML output for any ordinary package fields.

These are changes for master that correspond to https://github.com/pfsense/pfsense/pull/1672 on RELENG_2_2.
phil-davis/pfsense,ptorsten/pfsense,dennypage/pfsense,NewEraCracker/pfsense,brunostein/pfsense,BlackstarGroup/pfsense,pfsense/pfsense,dennypage/pfsense,brunostein/pfsense,pfsense/pfsense,ch1c4um/pfsense,jxmx/pfsense,ch1c4um/pfsense,dennypage/pfsense,pfsense/pfsense,BlackstarGroup/pfsense,NewEraCracker/pfsense,phil-davis/pfsense,NOYB/pfsense,jxmx/pfsense,BlackstarGroup/pfsense,phil-davis/pfsense,ptorsten/pfsense,BlackstarGroup/pfsense,NOYB/pfsense,phil-davis/pfsense,NewEraCracker/pfsense,pfsense/pfsense,NOYB/pfsense,NewEraCracker/pfsense,jxmx/pfsense,dennypage/pfsense,brunostein/pfsense,ptorsten/pfsense,ch1c4um/pfsense,ch1c4um/pfsense