Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Office365OAuthService: Restore Accept header in user info request
  Upgrade bazlets to latest stable-2.16

Change-Id: Idfe4c098c23512e416ba2534e754c562eae6f8d0

src/main/java/com/googlesource/gerrit/plugins/oauth/Office365OAuthService.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/oauth/Office365OAuthService.java b/src/main/java/com/googlesource/gerrit/plugins/oauth/Office365OAuthService.java
index c1380bc..4e0803b 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/oauth/Office365OAuthService.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/oauth/Office365OAuthService.java
@@ -80,6 +80,7 @@
     OAuthRequest request = new OAuthRequest(Verb.GET, PROTECTED_RESOURCE_URL);
     OAuth2AccessToken t = new OAuth2AccessToken(token.getToken(), token.getRaw());
     service.signRequest(t, request);
+    request.addHeader("Accept", "*/*");
 
     JsonElement userJson = null;
     try (Response response = service.execute(request)) {