Merge branch 'develop' into test/performance-profile

Author: rakibansary

src/services/ChallengeService.js

@@ -1562,7 +1562,7 @@ async function update (currentUser, challengeId, data, isFull) {
   }
 
   await validateChallengeData(data)
-  if ((challenge.status === constants.challengeStatuses.Completed || challenge.status === constants.challengeStatuses.Cancelled) && data.status && data.status !== challenge.status) {
+  if ((challenge.status === constants.challengeStatuses.Completed || challenge.status === constants.challengeStatuses.Cancelled) && data.status && (data.status !== challenge.status && data.status !== constants.challengeStatuses.CancelledClientRequest)) {
     throw new errors.BadRequestError(`Cannot change ${challenge.status} challenge status to ${data.status} status`)
   }