Replace deprecated test assert statements.
Merge branch 'master' of git://github.com/plone/Products.Archetypes

Conflicts:
	CHANGES.txt