957059 - re-write URL matching code to prevent trying to match the querystring
957070 - reinstate preinstall back and fix nits from feedback
957070 - rename files with WebApp prefix