Replace deprecated test assert statements.
Move docs/CHANGES.txt to CHANGES.rst.
Merge branch 'master' into remove-tool-discussion

Conflicts:
	Products/CMFPlone/tests/testContentTypeScripts.py
Remove plonetheme.classic from the package dependencies and the default extension profile, since it will not ship with Plone 5.