[imp] [32983] Remove the double scrollbar at the batch modals, Fix #2844
[CodeStyle] Make Jenkins happy again