Merge branch 'stable-2.6' into stable-2.7

* stable-2.6:
  Bump openid4java dependency to 0.9.8
  Provide direct link to REST API documentation
  init: Gracefully handle missing browser
  Improve explanation of path conflicts in project config doc
  init: Don't set username on upgrade if database.type is JDBC

gerrit-gwtui/src/main/java/com/google/gerrit/client/Gerrit.java

@@ -695,6 +695,7 @@ public class Gerrit implements EntryPoint {
       addDocLink(m, C.menuDocumentationSearch(), "user-search.html");
       addDocLink(m, C.menuDocumentationUpload(), "user-upload.html");
       addDocLink(m, C.menuDocumentationAccess(), "access-control.html");
+      addDocLink(m, C.menuDocumentationAPI(), "rest-api.html");
       menuLeft.add(m, C.menuDocumentation());
     }
 

gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.java

@@ -88,6 +88,7 @@ public interface GerritConstants extends Constants {
   String menuDocumentationSearch();
   String menuDocumentationUpload();
   String menuDocumentationAccess();
+  String menuDocumentationAPI();
 
   String searchHint();
   String searchButton();

gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritConstants.properties

@@ -71,6 +71,7 @@ menuDocumentationIndex = Index
 menuDocumentationSearch = Searching
 menuDocumentationUpload = Uploading
 menuDocumentationAccess = Access Controls
+menuDocumentationAPI = REST API
 
 searchHint = Change #, SHA-1, tr:id or owner:email
 searchButton = Search