pfSense

I thought we had a workaround in place for that but I'm not seeing it now.

The function in question could be copied back into upgrade_config.inc as a local function declaration inside upgrade_215_to_216() with its name changed to be specific to that function as well. It could also likely remove a few parts of the original function that are redundant in the new location (no need to initialize things already initialized in the upgrade function).

Look at upgrade_218_to_219() and function upgrade219_get_ipsecifnum() for example.