SKU-1021 #comment I apologise to anyone who has to merge against this but it needed doing. Checkstyle checks and fixes to style to pass.