Merge remote-tracking branch 'upstream/application-mgt-new' into application-mgt-new

# Conflicts:
#	components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/appsTable/AppsTable.js
#	components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/ReleaseView.js
#	components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/edit-release/EditRelease.js
#	components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/release/lifeCycle/LifeCycle.js
#	components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageTags.js
#	components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/subForms/NewAppDetailsForm.js
#	components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/new-app/subForms/NewAppUploadForm.js

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/ApplicationManagerImpl.java

@@ -2870,7 +2870,8 @@ public class ApplicationManagerImpl implements ApplicationManager {
             }
             ApplicationReleaseDTO applicationReleaseDTO = applicationDTO.getApplicationReleaseDTOs().get(0);
             String artifactDownloadURL = APIUtil.getArtifactDownloadBaseURL() + applicationReleaseDTO.getUuid()
-                    + Constants.FORWARD_SLASH + applicationReleaseDTO.getInstallerName();
+                    + Constants.FORWARD_SLASH + Constants.APP_ARTIFACT + Constants.FORWARD_SLASH +
+                                         applicationReleaseDTO.getInstallerName();
             String plistContent = "<!DOCTYPE plist PUBLIC "-//Apple//DTDPLIST1.0//EN" "" +
                                   "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist version="" +
                                   "1.0"><dict><key>items</key><array><dict><" +

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/appsTable/AppsTable.js

@@ -55,7 +55,8 @@ const columns = [
                     return (
                         <Tag
                             style={{marginBottom: 8}}
-                            color={pSBC(0.30, config.theme.primaryColor)} key={category}>
+                            color={pSBC(0.30, config.theme.primaryColor)}
+                            key={category}>
                             {category}
                         </Tag>
                     );

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/manage/categories/ManageCategories.js

@@ -161,6 +161,7 @@ class ManageCategories extends React.Component {
     };
 
     renderTempElement = (category) => {
+        const config = this.props.context;
         const tagElem = (
             <Tag
                 style={{marginTop:8}}