[MNG-4664] Minor patches needed to run Maven3 with the replacement Guice-Plexus container Submitted by: Stuart McCulloch