[java-sig-commits] [javapackages/xmvn-resolve-wrapper] [maven.req] Fix rebase bugs