Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Remove unnecessarily nested else-clauses
  Format all Java files with google-java-format 1.6
  Fix typo in config example

Change-Id: Ic6b31e14255877585d6416bba71127175b655d65