(cherry picked from commit 09ec127470) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> Conflicts: framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageDetector.java framework/ipc/test/org/apache/cloudstack/messagebus/TestMessageBus.java
09ec127470