merge -r1214300:1214301 https://svn.apache.org/repos/asf/archiva/branches/1.4-M2-RC
merge -r1214300:1214301 https://svn.apache.org/repos/asf/archiva/branches/1.4-M2-RC

git-svn-id: 5a9cb29c8d7fce18aac47241089437545778aaf0@1214303 13f79535-47bb-0310-9956-ffa450edef68

olamy/archiva,emsouza/archiva,emsouza/archiva,flomotlik/archiva,emsouza/archiva,Altiscale/archiva,Altiscale/archiva,flomotlik/archiva,Altiscale/archiva,apache/archiva,apache/archiva,olamy/archiva,apache/archiva,apache/archiva,sadlil/archiva,flomotlik/archiva,apache/archiva,emsouza/archiva,Altiscale/archiva,sadlil/archiva,ricardojbasilio/archiva,flomotlik/archiva,ricardojbasilio/archiva,sadlil/archiva,sadlil/archiva,ricardojbasilio/archiva,olamy/archiva,ricardojbasilio/archiva,olamy/archiva,sadlil/archiva