[MOD-1369] apiKey takes priority over OAuth
Merge pull request #38 from jonalter/MOD-1369

[MOD-1369] apiKey takes priority over OAuth