move upper_case_acronyms back to style, but make the default behaviour less aggressive by default (can be unleashed via config option)#6788