Trying to fix error in environment.rb because it hasn't loaded all the dependencies for the mq listener thread
Merge remote-tracking branch 'origin/master'