Merge "Support openjdk11 in CSIT magnesium"