GRAILS-10629 merged the new listener and adapter into the originals and added the errors instance to existing methods