Merge "upgrade the JSDK java 11 for specific branches"