aab5b50070
with fixes needed for further migration
also revert back jvm target to 1.8
(cherry picked from commit 3fb42b6ce9)