TDI-30521 : Switching DB-Connection-Typ keeps schema/catalog
Merge branch 'maintenance/5.6'