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