Merge branch 'master' into develop

Author: Ethan Hann

IntegrationEngine/MessageQueue/RabbitMQListener.cs

@@ -32,7 +32,7 @@ public RabbitMQListener()
             shouldTerminate = false;
         }
 
-        void Dispose()
+        public void Dispose()
         {
             shouldTerminate = true;
             listenerThread.Join();