Merge "fix maven local build issue"

No match.