Merge branch 'stable-2.14'

* stable-2.14:
  Adapt init to Gerrit 2.14 readEnum() interface

Change-Id: Ib0c1bc1e4278467ed6b7c717b1e049d159d42445