I thought I had merged this before but clearly not :-(
Also fixed a deprecation warning in testZopePageTemplate.py.