oauth2 modified to handle more services
Merge commit 'cea4802e5fa2197c72c3410a233dec1601421394' into develop