A fix for bug #8143.  I am now including the gatewaylist template.