Fixes for bug in OpenAuth logic. This fix allows multiple Oauth based

Fixes for bug in OpenAuth logic. This fix allows multiple Oauth (Both 1.0 and 2) based endpoints to coexist.