Removed the dependency on oauth2
Patch oauth so missing oauth_token elements are allowed
Merge branch 'master' into u/ixa1