Update changelog for issue #6551.
Merge pull request #2004 from kacfengine/3.6.x

Update changelog for issue #6551.
Merge remote-tracking branch 'upstream/3.6.x' into 3.6.x_surfsara