CLOUD-118 A checkstyle fixes