HHH-8211 Checkstyle and FindBugs fix-ups