Fix compilation against latest master branch of Gerrit ChangeListener was renamed to EventListener. Also organize imports in the touched classes. Change-Id: I35b5877d30601e656d5c77156cf97beb66b53800 Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>