Removed unmaintained upms stuff
Merge branch 'master' into ampersand-new

Conflicts:
	www/devel/upgrade/upms_server/lib/pear/Config.php
	www/devel/upgrade/upms_server/lib/pear/Config/Container.php
	www/devel/upgrade/upms_server/lib/pear/Config/Container/XML.php
	www/devel/upgrade/upms_server/lib/pear/HTTP/Request.php
	www/devel/upgrade/upms_server/lib/pear/Log/observer.php
	www/devel/upgrade/upms_server/lib/pear/MDB2.php
	www/devel/upgrade/upms_server/lib/pear/MDB2/Driver/mysql.php
	www/devel/upgrade/upms_server/lib/pear/MDB2/Schema.php
	www/devel/upgrade/upms_server/lib/pear/MDB2/Schema/Parser.php
	www/devel/upgrade/upms_server/lib/pear/MDB2/Schema/ParserChangeset.php
	www/devel/upgrade/upms_server/lib/pear/PEAR.php
	www/devel/upgrade/upms_server/lib/pear/XML/Parser.php
	www/devel/upgrade/upms_server/lib/pear/XML/Parser/Simple.php
Fixed test