Fix improperly use of the footer element (bug 764605)
Use '%s' instead of '%d' in recommanded settings for ADDON_ICON_URL and friends

Needed because of commit 79831950 (bug 985290)
adjust cronjob lock prefix
adjust cronjob lock prefix
adjust cronjob lock prefix
adjust cronjob lock prefix
allow multiple payment providers ensure API doesn't break
Fix typo in french translation
add in boku add template (bug 989512)
Merge pull request #1912 from andymckay/990007

add in boku add template (bug 989512)
try to fix jenkins
add Tamil; bug 991677
skip using mysql_pool in tests for now
typo
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