...
STATUS: 
Committed to trunk. This also had the consequence of removing entirely the need to convert demo objects (script has been removed and noted in docs as 3.1 and below only) before running tests with alternate ports, hostnames, and app server context.
...