Prevent CentralAuth tokens if OAuth is used

Prevent OAuth requests from asking for a centralauthtoken

Depends on I929967b707dc8f6f817cf35ff980b3ab42186126

Change-Id: Icd3c80e1c9f4f2404ac140b5c137d4142c479859