tree d0d63cc9236498705741149e21a8c4e0301b56e9
parent 448d47e7921d6b88f422b5db50435b0abea1dea2
author Dmitry Batrak <Dmitry.Batrak@jetbrains.com> 1579600475 +0300
committer Elena Sayapina <elena.sayapina@jetbrains.com> 1580711280 +0700

fix merge issues after merge from OpenJDK 11.0.6

(cherry picked from commit 5e77712607272f912367e21276ef172247d9527d)