BISERVER-10378 - CheckStyle changes
Merge pull request #345 from pminutillo/5.1-sandbox

BISERVER-10378 - CheckStyle changes