Fix logic error introduced sometime in the past 6 months that prevented all modules from being loaded.
Fix pylint, remove unecessary call to pu.db
Merge pull request #18812 from cro/proxy_logic_fix

Fix logic error introduced sometime in the past 6 months that prevented ...