Resolve "wrong databases are shown when selecting a server." Closes #6480 See merge request !1712
mentioned in commit 9d27652f