Merge pull request #173 from afrjorge/CDF-202

[CDF-202] - Comment Component: Unable to delete comment