CDB-357 #fixes problem clicking on wizards
Merge branch 'feature/2281_metadata_sql' into release/2.1.3.4.2