Fixes #6548 : Duplicated entries in default Scheme after upgrade from 2....

...2 in Oracle and MySQL.