Fixing two problems with Maven + Mercurial + Hudson: second take