CLOUD-216 oauth changes on master