Ensure logging is not shut down after upgrade
Merge pull request #2761 from jakewins/2.1-upgradelogging

Ensure logging is not shut down after upgrade