For 3.6.1 - MNG-5995 and MNG-6069

[Sylwester Lachiewicz]

Hi, I have 2 fixes (leftovers from 3.6.0) ready to merge - anyone to review?

[MNG-6069] https://github.com/apache/maven/pull/153
[MNG-5995] https://github.com/apache/maven/pull/185

Sylwester