Add recent changes from karaf-parent pom to the distribution pom