Merge branch 'hotfix/travis-build-status-codes'

Fixes for travis build status
[#3650] Do not re-inject EM instance

- If the controller already composes an EM instance, do not re-inject
  it. This allows factories to inject an EM instance and attach
  listeners.
[#3650] Fix failing test

- Override getEventManager() in test asset so that we can test
  injection, as parent was lazy initializing an EM instance.
Merge branch 'weierophinney-hotfix/3650' into develop