Fixes #3089 Big refactoring of OPSI import code