Merge pull request #480 from apache/master-java11

Master java11