merge changes from archiva-1.3.x for the release


git-svn-id: https://svn.apache.org/repos/asf/archiva/tags/archiva-1.3.6@1429720 13f79535-47bb-0310-9956-ffa450edef68
2 files changed