Add tests to ensure that user defined entities are stripped by the translation component
Merge branch 'daley', remote-tracking branch 'origin'