Merge "Add support for jdk11 in magnesium"