Fix a TON of warnings if there is a custom router_maps.php
Fixes remove_headlinecontroller upgrade script to now work AFTER container2 fix script