BISERVER-10378 - CheckStyle changes