Issue #3417816 by Watergate: Ensure database connection information is cleaned up properly after performing ConnectionTest