Merge changes Ifddb3dc7,I5870988e,Ic18ee3c0,I827716a8,I2540e902, ...

* changes:
  Remove unused HttpServletRequest and HttpServletResponse parameters
  Remove unnecessarily nested else blocks
  DocServlet#fileTooBig: Remove unused parameter
  Add missing serialVersionUIDs
  Remove unused Logger instances
  Format Java files with google-java-format 1.7

.mailmap

diff --git a/.mailmap b/.mailmap
index fd187c2..1799c12 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,2 +1,3 @@
 Even Stensberg <evenstensberg@gmail.com> ev1stensberg <evenstensberg@gmail.com>
 Shawn Pearce <sop@google.com>            Shawn O. Pearce <sop@google.com>
+Terry Parker <tparker@google.com>        tparker <tparker@google.com>