CRM-16555 call extracted form snippet not overloaded form snippet.

CRM-16555 call extracted form snippet not overloaded form snippet.
The payment form snippet has been extracted so it can be called from anywhere, use this & remove the over-loaded snippet
note the change of field name is to align front end & back-end but still an issue as back-end is select & front end is radio

CRM-16555 last may have been too agressive

CRM-16555 test fixes

x