merging with upstream

components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherUtil.java

@@ -75,7 +75,7 @@ public class APIPublisherUtil {
 
         api.setUrl(config.getEndpoint());
         api.addAvailableTiers(provider.getTiers());
-        api.setEndpointSecured(true);
+        api.setEndpointSecured(false);
         api.setStatus(APIStatus.CREATED);
         api.setTransports(config.getTransports());
         api.setApiLevelPolicy(config.getPolicy());

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.logo/logo.hbs

@@ -15,4 +15,5 @@
   specific language governing permissions and limitations
   under the License.
 }}
-{{#zone "productName"}}WSO2 IoT{{/zone}}
+{{#zone "productName"}}WSO2 IoT Server{{/zone}}
+{{#zone "productNameResponsive"}}WSO2 IoT Server{{/zone}}