Update zc.buildout and setuptools. refs #5733
Merge branch 'master' of github.com:IMIO/cpskin.policy

Conflicts:
	versions.cfg