synched to trunk (-r706114) in prep for merge


git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/MRM-124@706118 13f79535-47bb-0310-9956-ffa450edef68
190 files changed