Merge branch 'stable-2.16'

* stable-2.16:
  Update download-commands plugin revision
  Upgrade google-java-format to 1.7

Change-Id: I6e959cde5b4790b469902245c3a2278883c65cad

java/com/google/gerrit/server/git/MergeUtil.java

@@ -294,9 +294,7 @@ public class MergeUtil {
           ((ResolveMerger) m).getMergeResults();
 
       filesWithGitConflicts =
-          mergeResults
-              .entrySet()
-              .stream()
+          mergeResults.entrySet().stream()
               .filter(e -> e.getValue().containsConflicts())
               .map(Map.Entry::getKey)
               .collect(toImmutableSet());