make sure final import step happens after catalog (fixes CMFEditions test failures)