merge remaining changes from archiva-database-decoupling branch


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