Pushed to upstream

cc/ @brianchandotcom @juliocamarero.  Please execute this command to verify the problem: ant clean && cd hooks/deploy-listener-hook && ant clean compile && cd -