GJP-49 Fixed checkstyle errors for OSM layer