Revert "Update CherryPy to 3.5.0"  (fall back to 3.2.2)

This reverts commit 1b1b91ec48adc137fd4c44590b3a8843d10918e3.

Conflicts:
	build/entire/entire.p5m
	build/jeos/omnios-userland.p5m