few fixes after testing

components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/MQTTEventAdapter.java

@@ -84,9 +84,11 @@ public class MQTTEventAdapter implements InputEventAdapter {
                 .equals(MultitenantConstants.SUPER_TENANT_DOMAIN_NAME)) {
             return;
         }
+        synchronized (this.mqttAdapterListener) {
             if (!mqttAdapterListener.isConnectionInitialized()) {
                 mqttAdapterListener.createConnection();
             }
+        }
 
     }
 
@@ -102,10 +104,12 @@ public class MQTTEventAdapter implements InputEventAdapter {
             if (ServerStatus.getCurrentStatus().equals(ServerStatus.STATUS_SHUTTING_DOWN)) {
                 Thread thread = new Thread(new Runnable() {
                     public void run() {
+                        synchronized (mqttAdapterListener) {
                             if (mqttAdapterListener != null) {
                                 mqttAdapterListener.stopListener(eventAdapterConfiguration.getName());
                             }
                         }
+                    }
                 });
                 thread.start();
                 thread.join(2000);

components/extensions/pull-notification-listeners/org.wso2.carbon.device.mgt.mqtt.notification.listener/pom.xml

@@ -99,7 +99,8 @@
 							org.wso2.carbon.user.api,
 							org.wso2.carbon.core,
 							org.wso2.carbon.device.mgt.core.config,
-							org.wso2.carbon.device.mgt.core.config.pull.notification
+							org.wso2.carbon.device.mgt.core.config.pull.notification,
+							org.wso2.carbon.utils.multitenancy
                         </Import-Package>
                     </instructions>
                 </configuration>