Backport more fixes from mvn40 to mvn39 code
1 file changed