Fixed issue: Minor oAuth2 Controller_Provider fixes and cleaup
Merge pull request #743 from sergeyklay/master

Minor oAuth2 fixes and cleaup