merging mavenized branch changes from revision 382466 to the current head

git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@383566 13f79535-47bb-0310-9956-ffa450edef68
123 files changed