Polish to always use NOTE callouts
Update JRuby and Groovy versions
Restore image widths SPR-11143