Path fixes ATR-20404

Per Alexander Ekmanrequested to merge
pekman/athena:pathFix into master

Changed multiple import paths to point to their MT equivalent

Edited by Per Alexander Ekman

Merge request reports