Updating CHANGES.txt to reflect fixes from MR-279 branch that came into trunk when merging the two of them.