Changes to support not allowing hash as valid variable name.
Changes to support new database proxy templates.