Merge branch 'master' into 'master'

Fix policy edit not working when policy cache is disabled

Closes product-iots#290

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

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/dao/impl/PolicyDAOImpl.java

@@ -1038,6 +1038,7 @@ public class PolicyDAOImpl implements PolicyDAO {
                 policy.setProfileId(resultSet.getInt("PROFILE_ID"));
                 policy.setCompliance(resultSet.getString("COMPLIANCE"));
                 policy.setDescription(resultSet.getString("DESCRIPTION"));
+                policy.setPolicyType(resultSet.getString("POLICY_TYPE"));
                 policy.setUpdated(PolicyManagerUtil.convertIntToBoolean(resultSet.getInt("UPDATED")));
                 policy.setActive(PolicyManagerUtil.convertIntToBoolean(resultSet.getInt("ACTIVE")));
             }