Merge branch 'master' into 'master'

Fix not picking up or push_notification_provider in cdm config template

See merge request entgra/carbon-device-mgt!833

features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf_templates/templates/repository/conf/cdm-config.xml.j2

@@ -44,7 +44,7 @@
             <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>
         {% if device_mgt_conf.push_notification_conf.push_notification_providers is defined %}
             {%- for push_notification_provider in device_mgt_conf.push_notification_conf.push_notification_providers -%}
-            <Provider>{{push_notification_provider.name}}</Provider>
+            <Provider>{{push_notification_provider}}</Provider>
             {% endfor %}
         {% endif %}
         </PushNotificationProviders>