Merging changes over from MNG-3379 branch, working around issue that wagon's Resource doesn't have a proper hashcode, changing version and scm to 2.0.9-db