handle our very special 2-legged oauth case directly
Upgrade to oauthlib 0.6.2 (bug 917040)

Conflicts:
	mkt/api/middleware.py
Merge pull request #2167 from washort/oauth

Upgrade to oauthlib 0.6.2 (bug 917040)
enable China by default for app submission (bug 951468)
Commit from Mozilla Verbatim by user ibai@oihanguren.com.: 962 of 2491 strings translated (9 fuzzy).
Commit from Mozilla Verbatim by user ibai@oihanguren.com.: 963 of 2491 strings translated (9 fuzzy).
Merge pull request #2129 from cvan/default-special

enable China by default for app submission (bug 951468)
rename var to cope to avoid collision with import
Merge pull request #2175 from andymckay/fixup

rename var to cope to avoid collision with import
use `select_related(related_names)` instead of deprecated `select_related(depth=1)` (bug 1011676)