MDL-48142 core_badge: bug fixes on the badge event class