Merge "Enable java 11 for cli"