Ollie Fixes for esm-environment

Paul Gierzrequested to merge
ollie_fix into master

Commits used to get esm-environment to work correctly on ollie

Edited by Dirk Barbi

Merge request reports

Imprint | Privacy Policy