Also a checkstyle fix to master: https://github.com/hibernate/hibernate-orm/commit/57f156769b3d3597780fbd90f8ba2cecf614be56
