[vote] merge Archiva MRM-239 branch to trunk

[Joakim Erdfelt]

I would like to merge the archiva-MRM-239 branch back to trunk.

Not sure how long I should wait for the vote replies, but I'll do the
usual 72.

- Joakim