Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  ValidatorConfig: Remove redundant else-clause
  Align Eclipse compiler settings with core Gerrit's

Change-Id: I09535544d7a2ab123672b9921aca606115c19e9d