stop mis-configuration and ensure its set on -dev
Merge pull request #1917 from andymckay/fixup

stop mis-configuration and ensure its set on -dev
Allow for multiple payment providers (bug 969041)