HH-46254 format
HH-46254 make compilable with OpenJDK8 [i.garanina]