ENG-5774 and (dup) ENG-4736 one-liner to avoid updateCatalog NPE deep wi...

...thin hsql re-init