Merge branch 'master' into 'master'

Fix policy not loading due to missing comma in js

See merge request entgra/carbon-device-mgt-plugins!148

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-mod/public/js/operation-mod.js

@@ -136,7 +136,7 @@ var androidOperationModule = function () {
                     "passcodePolicyMaxPasscodeAgeInDays": operationPayload["maxPINAgeInDays"],
                     "passcodePolicyPasscodeHistory": operationPayload["pinHistory"],
                     "maximumNumberOfFailedAttemptsBeforeDeviceLock": operationPayload["maxFailedAttemptsDeviceLock"],
-                    "maximumNumberOfFailedAttemptsBeforeDeviceWipe": operationPayload["maxFailedAttemptsDeviceWipe"]
+                    "maximumNumberOfFailedAttemptsBeforeDeviceWipe": operationPayload["maxFailedAttemptsDeviceWipe"],
                     "passcodePolicyMaxTimeToLock": operationPayload["maxTimeToLock"],
                     "passcodePolicyWPExist": operationPayload["passcodePolicyWPExist"]
                 };
@@ -578,7 +578,7 @@ var androidOperationModule = function () {
                         "maxPINAgeInDays": operationData["passcodePolicyMaxPasscodeAgeInDays"],
                         "pinHistory": operationData["passcodePolicyPasscodeHistory"],
                         "maxTimeToLock": operationData["passcodePolicyMaxTimeToLock"],
-                        "passcodePolicyWPExist": operationData["passcodePolicyWPExist"]
+                        "passcodePolicyWPExist": operationData["passcodePolicyWPExist"],
                         "maxFailedAttemptsDeviceLock": operationData["maximumNumberOfFailedAttemptsBeforeDeviceLock"],
                         "maxFailedAttemptsDeviceWipe": operationData["maximumNumberOfFailedAttemptsBeforeDeviceWipe"]
                     }