JAL-3285 small code changes to AnnotationRenderer not included in merge