EE port of fix-translation-namespaces

Merged Phil Hughes requested to merge ee-fix-translation-namespaces into master