"Collaborator should be able to delete comments"
Merge remote-tracking branch 'upstream/release-6.6.3.a1' into release-6.6.3.a1

* upstream/release-6.6.3.a1:
  Changes for comments edit on comment off mode implemented
Merge pull request #2473 from anilgooru/release-6.6.3.a1

"Collaborator should be able to delete comments"