Update CHANGES.txt

Change log entry for https://github.com/plone/plone.app.z3cform/commit/6d20d8e420da2ef7c1a397144c3343dab351e578
Merge branch 'master' into inlinedisposition

Conflicts:
	CHANGES.txt