Refactor the integration-test pom file and fix dependency conflicts.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1524346 13f79535-47bb-0310-9956-ffa450edef68