Merge "Reorder public/private modifiers as per JLS. (fixes sonar warnings)"