diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in
index 1f5ab20333a..2e340bfbfab 100644
--- a/client/tomcatconf/applicationContext.xml.in
+++ b/client/tomcatconf/applicationContext.xml.in
@@ -82,7 +82,7 @@
     <property name="messageSerializer" ref="messageSerializer" />
   </bean>
 
-  <bean id="eventBus" class = "org.apache.cloudstack.framework.eventbus.EventBusBase" />
+  <bean id="messageBus" class = "org.apache.cloudstack.framework.messagebus.MessageBusBase" />
 
   <!--
     DAO with customized configuration
diff --git a/core/src/com/cloud/vm/VMInstanceVO.java b/core/src/com/cloud/vm/VMInstanceVO.java
index 77e9c0279c9..5ec2712d3d8 100644
--- a/core/src/com/cloud/vm/VMInstanceVO.java
+++ b/core/src/com/cloud/vm/VMInstanceVO.java
@@ -153,7 +153,6 @@ public class VMInstanceVO implements VirtualMachine, FiniteStateObject<State, Vi
 
     @Column(name="uuid")
     protected String uuid = UUID.randomUUID().toString();
-    ;
 
     @Column(name="disk_offering_id")
     protected Long diskOfferingId;
diff --git a/framework/ipc/src/org/apache/cloudstack/framework/client/ClientEventBus.java b/framework/ipc/src/org/apache/cloudstack/framework/client/ClientEventBus.java
index 7930bf2fea0..d876b01981a 100644
--- a/framework/ipc/src/org/apache/cloudstack/framework/client/ClientEventBus.java
+++ b/framework/ipc/src/org/apache/cloudstack/framework/client/ClientEventBus.java
@@ -18,10 +18,10 @@
  */
 package org.apache.cloudstack.framework.client;
 
-import org.apache.cloudstack.framework.eventbus.EventBusBase;
+import org.apache.cloudstack.framework.messagebus.MessageBusBase;
 import org.apache.cloudstack.framework.transport.TransportMultiplexier;
 
-public class ClientEventBus extends EventBusBase implements TransportMultiplexier {
+public class ClientEventBus extends MessageBusBase implements TransportMultiplexier {
 
 	@Override
 	public void onTransportMessage(String senderEndpointAddress,
diff --git a/framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventBus.java b/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBus.java
similarity index 83%
rename from framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventBus.java
rename to framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBus.java
index 200715c396f..4aa007d083a 100644
--- a/framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventBus.java
+++ b/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBus.java
@@ -17,16 +17,16 @@
  * under the License.
  */
 
-package org.apache.cloudstack.framework.eventbus;
+package org.apache.cloudstack.framework.messagebus;
 
 import org.apache.cloudstack.framework.serializer.MessageSerializer;
 
-public interface EventBus {
+public interface MessageBus {
 	void setMessageSerializer(MessageSerializer messageSerializer);
 	MessageSerializer getMessageSerializer();
 	
-	void subscribe(String subject, Subscriber subscriber);
-	void unsubscribe(String subject, Subscriber subscriber);
+	void subscribe(String subject, MessageSubscriber subscriber);
+	void unsubscribe(String subject, MessageSubscriber subscriber);
 	
 	void publish(String senderAddress, String subject, PublishScope scope, Object args);
 }
diff --git a/framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventBusBase.java b/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusBase.java
similarity index 88%
rename from framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventBusBase.java
rename to framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusBase.java
index 30a847f0f9a..5b7af4d2376 100644
--- a/framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventBusBase.java
+++ b/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusBase.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cloudstack.framework.eventbus;
+package org.apache.cloudstack.framework.messagebus;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -28,7 +28,7 @@ import java.util.Map;
 
 import org.apache.cloudstack.framework.serializer.MessageSerializer;
 
-public class EventBusBase implements EventBus {
+public class MessageBusBase implements MessageBus {
 
 	private Gate _gate;
 	private List<ActionRecord> _pendingActions;
@@ -36,7 +36,7 @@ public class EventBusBase implements EventBus {
 	private SubscriptionNode _subscriberRoot;
 	private MessageSerializer _messageSerializer; 
 	
-	public EventBusBase() {
+	public MessageBusBase() {
 		_gate = new Gate();
 		_pendingActions = new ArrayList<ActionRecord>();
 		
@@ -54,7 +54,7 @@ public class EventBusBase implements EventBus {
 	}
 	
 	@Override
-	public void subscribe(String subject, Subscriber subscriber) {
+	public void subscribe(String subject, MessageSubscriber subscriber) {
 		assert(subject != null);
 		assert(subscriber != null);
 		if(_gate.enter()) {
@@ -70,7 +70,7 @@ public class EventBusBase implements EventBus {
 	}
 
 	@Override
-	public void unsubscribe(String subject, Subscriber subscriber) {
+	public void unsubscribe(String subject, MessageSubscriber subscriber) {
 		if(_gate.enter()) {
 			SubscriptionNode current = locate(subject, null, false);
 			if(current != null)
@@ -186,9 +186,9 @@ public class EventBusBase implements EventBus {
 	private static class ActionRecord {
 		private ActionType _type;
 		private String _subject;
-		private Subscriber _subscriber;
+		private MessageSubscriber _subscriber;
 		
-		public ActionRecord(ActionType type, String subject, Subscriber subscriber) {
+		public ActionRecord(ActionType type, String subject, MessageSubscriber subscriber) {
 			_type = type;
 			_subject = subject;
 			_subscriber = subscriber;
@@ -202,7 +202,7 @@ public class EventBusBase implements EventBus {
 			return _subject;
 		}
 		
-		public Subscriber getSubscriber() {
+		public MessageSubscriber getSubscriber() {
 			return _subscriber;
 		}
 	}
@@ -264,13 +264,13 @@ public class EventBusBase implements EventBus {
 	private static class SubscriptionNode {
 		@SuppressWarnings("unused")
 		private String _nodeKey;
-		private List<Subscriber> _subscribers;
+		private List<MessageSubscriber> _subscribers;
 		private Map<String, SubscriptionNode> _children;
 		
-		public SubscriptionNode(String nodeKey, Subscriber subscriber) {
+		public SubscriptionNode(String nodeKey, MessageSubscriber subscriber) {
 			assert(nodeKey != null);
 			_nodeKey = nodeKey;
-			_subscribers = new ArrayList<Subscriber>();
+			_subscribers = new ArrayList<MessageSubscriber>();
 			
 			if(subscriber != null)
 				_subscribers.add(subscriber);
@@ -279,15 +279,15 @@ public class EventBusBase implements EventBus {
 		}
 		
 		@SuppressWarnings("unused")
-		public List<Subscriber> getSubscriber() {
+		public List<MessageSubscriber> getSubscriber() {
 			return _subscribers;
 		}
 		
-		public void addSubscriber(Subscriber subscriber) {
+		public void addSubscriber(MessageSubscriber subscriber) {
 			_subscribers.add(subscriber);
 		}
 		
-		public void removeSubscriber(Subscriber subscriber) {
+		public void removeSubscriber(MessageSubscriber subscriber) {
 			_subscribers.remove(subscriber);
 		}
 		
@@ -300,8 +300,8 @@ public class EventBusBase implements EventBus {
 		}
 		
 		public void notifySubscribers(String senderAddress, String subject,  Object args) {
-			for(Subscriber subscriber : _subscribers) {
-				subscriber.onPublishEvent(senderAddress, subject, args);
+			for(MessageSubscriber subscriber : _subscribers) {
+				subscriber.onPublishMessage(senderAddress, subject, args);
 			}
 		}
 	}
diff --git a/framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventBusEndpoint.java b/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusEndpoint.java
similarity index 77%
rename from framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventBusEndpoint.java
rename to framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusEndpoint.java
index 19a9b03dad9..0824e131e25 100644
--- a/framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventBusEndpoint.java
+++ b/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusEndpoint.java
@@ -17,26 +17,26 @@
  * under the License.
  */
 
-package org.apache.cloudstack.framework.eventbus;
+package org.apache.cloudstack.framework.messagebus;
 
 
-public class EventBusEndpoint {
-	private EventBus _eventBus;
+public class MessageBusEndpoint {
+	private MessageBus _eventBus;
 	private String _sender;
 	private PublishScope _scope;
 	
-	public EventBusEndpoint(EventBus eventBus, String sender, PublishScope scope) {
+	public MessageBusEndpoint(MessageBus eventBus, String sender, PublishScope scope) {
 		_eventBus = eventBus;
 		_sender = sender;
 		_scope = scope;
 	}
 	
-	public EventBusEndpoint setEventBus(EventBus eventBus) {
+	public MessageBusEndpoint setEventBus(MessageBus eventBus) {
 		_eventBus = eventBus;
 		return this;
 	}
 	
-	public EventBusEndpoint setScope(PublishScope scope) {
+	public MessageBusEndpoint setScope(PublishScope scope) {
 		_scope = scope;
 		return this;
 	}
@@ -45,7 +45,7 @@ public class EventBusEndpoint {
 		return _scope;
 	}
 	
-	public EventBusEndpoint setSender(String sender) {
+	public MessageBusEndpoint setSender(String sender) {
 		_sender = sender;
 		return this;
 	}
diff --git a/framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventDispatcher.java b/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageDispatcher.java
similarity index 83%
rename from framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventDispatcher.java
rename to framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageDispatcher.java
index 336a994a6cc..ac75afb7c7d 100644
--- a/framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventDispatcher.java
+++ b/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageDispatcher.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cloudstack.framework.eventbus;
+package org.apache.cloudstack.framework.messagebus;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -24,27 +24,27 @@ import java.util.HashMap;
 import java.util.Map;
 
 
-public class EventDispatcher implements Subscriber {
+public class MessageDispatcher implements MessageSubscriber {
 	private static Map<Class<?>, Method> s_handlerCache = new HashMap<Class<?>, Method>();
 	
-	private static Map<Object, EventDispatcher> s_targetMap = new HashMap<Object, EventDispatcher>();
+	private static Map<Object, MessageDispatcher> s_targetMap = new HashMap<Object, MessageDispatcher>();
 	private Object _targetObject;
 	
-	public EventDispatcher(Object targetObject) {
+	public MessageDispatcher(Object targetObject) {
 		_targetObject = targetObject;
 	}
 	
 	@Override
-	public void onPublishEvent(String senderAddress, String subject, Object args) {
+	public void onPublishMessage(String senderAddress, String subject, Object args) {
 		dispatch(_targetObject, subject, senderAddress, args);
 	}
 	
-	public static EventDispatcher getDispatcher(Object targetObject) {
-		EventDispatcher dispatcher;
+	public static MessageDispatcher getDispatcher(Object targetObject) {
+		MessageDispatcher dispatcher;
 		synchronized(s_targetMap) {
 			dispatcher = s_targetMap.get(targetObject);
 			if(dispatcher == null) {
-				dispatcher = new EventDispatcher(targetObject);
+				dispatcher = new MessageDispatcher(targetObject);
 				s_targetMap.put(targetObject, dispatcher);
 			}
 		}
@@ -85,7 +85,7 @@ public class EventDispatcher implements Subscriber {
 				return handler;
 			
 			for(Method method : handlerClz.getMethods()) {
-				EventHandler annotation = method.getAnnotation(EventHandler.class);
+				MessageHandler annotation = method.getAnnotation(MessageHandler.class);
 				if(annotation != null) {
 					if(match(annotation.topic(), subject)) {
 						s_handlerCache.put(handlerClz, method);
diff --git a/framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventHandler.java b/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageHandler.java
similarity index 92%
rename from framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventHandler.java
rename to framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageHandler.java
index 1ed3a00b96f..d9f51df1a11 100644
--- a/framework/ipc/src/org/apache/cloudstack/framework/eventbus/EventHandler.java
+++ b/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageHandler.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.cloudstack.framework.eventbus;
+package org.apache.cloudstack.framework.messagebus;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -25,6 +25,6 @@ import java.lang.annotation.Target;
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
-public @interface EventHandler {
+public @interface MessageHandler {
 	public String topic();
 }
diff --git a/framework/ipc/src/org/apache/cloudstack/framework/eventbus/Subscriber.java b/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageSubscriber.java
similarity index 83%
rename from framework/ipc/src/org/apache/cloudstack/framework/eventbus/Subscriber.java
rename to framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageSubscriber.java
index 28b86de050e..072f98d9d1e 100644
--- a/framework/ipc/src/org/apache/cloudstack/framework/eventbus/Subscriber.java
+++ b/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageSubscriber.java
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-package org.apache.cloudstack.framework.eventbus;
+package org.apache.cloudstack.framework.messagebus;
 
-public interface Subscriber {
-	void onPublishEvent(String senderAddress, String subject, Object args);
+public interface MessageSubscriber {
+	void onPublishMessage(String senderAddress, String subject, Object args);
 }
diff --git a/framework/ipc/src/org/apache/cloudstack/framework/eventbus/PublishScope.java b/framework/ipc/src/org/apache/cloudstack/framework/messagebus/PublishScope.java
similarity index 94%
rename from framework/ipc/src/org/apache/cloudstack/framework/eventbus/PublishScope.java
rename to framework/ipc/src/org/apache/cloudstack/framework/messagebus/PublishScope.java
index 539a242a55f..2b3d8acc841 100644
--- a/framework/ipc/src/org/apache/cloudstack/framework/eventbus/PublishScope.java
+++ b/framework/ipc/src/org/apache/cloudstack/framework/messagebus/PublishScope.java
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.cloudstack.framework.eventbus;
+package org.apache.cloudstack.framework.messagebus;
 
 public enum PublishScope {
 	LOCAL, GLOBAL 
diff --git a/framework/ipc/src/org/apache/cloudstack/framework/server/ServerEventBus.java b/framework/ipc/src/org/apache/cloudstack/framework/server/ServerEventBus.java
index 11bc428a42b..f3b782d6d35 100644
--- a/framework/ipc/src/org/apache/cloudstack/framework/server/ServerEventBus.java
+++ b/framework/ipc/src/org/apache/cloudstack/framework/server/ServerEventBus.java
@@ -18,10 +18,10 @@
  */
 package org.apache.cloudstack.framework.server;
 
-import org.apache.cloudstack.framework.eventbus.EventBusBase;
+import org.apache.cloudstack.framework.messagebus.MessageBusBase;
 import org.apache.cloudstack.framework.transport.TransportMultiplexier;
 
-public class ServerEventBus extends EventBusBase implements TransportMultiplexier {
+public class ServerEventBus extends MessageBusBase implements TransportMultiplexier {
 
 	@Override
 	public void onTransportMessage(String senderEndpointAddress,
diff --git a/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent.java b/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent.java
index 7b0a2eca192..d59fe42d5ea 100644
--- a/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent.java
+++ b/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent.java
@@ -24,9 +24,9 @@ import java.util.TimerTask;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
-import org.apache.cloudstack.framework.eventbus.EventBus;
-import org.apache.cloudstack.framework.eventbus.EventDispatcher;
-import org.apache.cloudstack.framework.eventbus.EventHandler;
+import org.apache.cloudstack.framework.messagebus.MessageBus;
+import org.apache.cloudstack.framework.messagebus.MessageDispatcher;
+import org.apache.cloudstack.framework.messagebus.MessageHandler;
 import org.apache.cloudstack.framework.rpc.RpcCallbackListener;
 import org.apache.cloudstack.framework.rpc.RpcException;
 import org.apache.cloudstack.framework.rpc.RpcProvider;
@@ -41,7 +41,7 @@ public class SampleManagerComponent {
     private static final Logger s_logger = Logger.getLogger(SampleManagerComponent.class);
 	
 	@Inject
-	private EventBus _eventBus;
+	private MessageBus _eventBus;
  	
 	@Inject
 	private RpcProvider _rpcProvider;
@@ -58,7 +58,7 @@ public class SampleManagerComponent {
 			
 		// subscribe to all network events (for example)
 		_eventBus.subscribe("network", 
-			EventDispatcher.getDispatcher(this));
+			MessageDispatcher.getDispatcher(this));
 		
 		_timer.schedule(new TimerTask() {
 				public void run() {
@@ -72,7 +72,7 @@ public class SampleManagerComponent {
 		call.completeCall("NetworkPrepare completed");
 	}
 	
-	@EventHandler(topic="network.prepare")
+	@MessageHandler(topic="network.prepare")
 	void onPrepareNetwork(String sender, String topic, Object args) {
 	}
 	
diff --git a/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent2.java b/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent2.java
index dc482c035fb..448c37b4c45 100644
--- a/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent2.java
+++ b/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagerComponent2.java
@@ -21,9 +21,9 @@ package org.apache.cloudstack.framework.sampleserver;
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
-import org.apache.cloudstack.framework.eventbus.EventBus;
-import org.apache.cloudstack.framework.eventbus.EventDispatcher;
-import org.apache.cloudstack.framework.eventbus.EventHandler;
+import org.apache.cloudstack.framework.messagebus.MessageBus;
+import org.apache.cloudstack.framework.messagebus.MessageDispatcher;
+import org.apache.cloudstack.framework.messagebus.MessageHandler;
 import org.apache.cloudstack.framework.rpc.RpcProvider;
 import org.apache.cloudstack.framework.rpc.RpcServerCall;
 import org.apache.cloudstack.framework.rpc.RpcServiceDispatcher;
@@ -36,7 +36,7 @@ public class SampleManagerComponent2 {
     private static final Logger s_logger = Logger.getLogger(SampleManagerComponent2.class);
 	
 	@Inject
-	private EventBus _eventBus;
+	private MessageBus _eventBus;
 
 	@Inject
 	private RpcProvider _rpcProvider;
@@ -51,7 +51,7 @@ public class SampleManagerComponent2 {
 			
 		// subscribe to all network events (for example)
 		_eventBus.subscribe("storage", 
-			EventDispatcher.getDispatcher(this));
+			MessageDispatcher.getDispatcher(this));
 	}
 	
 	@RpcServiceHandler(command="StoragePrepare")
@@ -66,7 +66,7 @@ public class SampleManagerComponent2 {
 		call.completeCall(answer);
 	}
 	
-	@EventHandler(topic="storage.prepare")
+	@MessageHandler(topic="storage.prepare")
 	void onPrepareNetwork(String sender, String topic, Object args) {
 	}
 	
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
index eb09af0d67e..9f260f1812c 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
@@ -494,7 +494,8 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
                         s_logger.info("Inject SSH key pairs before copying systemvm.iso into secondary storage");
                         _configServer.updateKeyPairs();
 
-
+                        s_logger.info("Copy System VM patch ISO file to secondary storage. source ISO: " + srcIso.getAbsolutePath() +
+                        	", destination: " + destIso.getAbsolutePath());
                         try {
                             FileUtil.copyfile(srcIso, destIso);
                         } catch(IOException e) {