Address warning in GatewayFormChooser
Kill an old unused variable, and move filter for "special" type to top
of form selection loop in getAllValidForms.

Change-Id: Ibf3f855810fb397ab7917db5b500b89fb25acfef