Fix improperly use of the footer element (bug 764605)
allow multiple payment providers ensure API doesn't break
Merge pull request #1728 from davidbgk/764605-improperly-footer

Fix improperly use of the footer element (bug 764605)
Use CDN when returning rocketfuel collections images URLs (bug 990295)

Also set-up Cache-Control for images and authorize anonymous to
make OPTIONS/HEAD requests (which makes manual testing much easier)
Merge pull request #1907 from diox/rocketfuel-image-use-cdn

Use CDN when returning rocketfuel collections images URLs (bug 990295)
remove git conflicts
Merge pull request #1913 from andymckay/multiple

allow multiple payment providers, ensure API doesn't break
stop mis-configuration and ensure its set on -dev
fix up test
Merge pull request #1917 from andymckay/fixup

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