issue #19550: Fix problem with sale type orm missing system flag. Tweak init script to not have redundant calls.
Merge branch 'master' into 19552