JAL-3093 tweaks to code and test for 3px gap above annotations in