Checkstyle template modification pack2 applied (fixes #695)