Fix export in old API for new signature. Refs #6882
Merge branch 'feature/6882_export_unitfactory' into develop