tree 3cbaff26c15a4cabe0d011b6dc8b2eb5685ce787
parent 94b5657b8627e96ec85724c9d31432bf10ce5cb9
parent 4053020c54159e3a0051267d41626bb0fd82b92f
author Hugo Arès <hugo.ares@ericsson.com> 1499280326 -0400
committer Hugo Arès <hugo.ares@ericsson.com> 1499280802 -0400

Merge branch 'stable-2.13'

* stable-2.13:
  Compile against Gerrit 2.13.9
  Remove usage of java.util.Optional

"Remove usage of java.util.Optional" is reverted in this merge, this
commit was only needed on stable-2.13 branch.

Change-Id: I9220a5fdf443f8537aa58b23491c37c6b6b58e79