SLING-2789 - deploying Sling 7-SNAPSHOT on Karaf fails

Applied patch SLING-2789.2013-07-25.a.patch from Oliver Lietz.

- removed 'BUILD' component from versions
- misc version updates

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1508099 13f79535-47bb-0310-9956-ffa450edef68
SLING-2789 - deploying Sling 7-SNAPSHOT on Karaf fails

Re-added the launchpad/karaf module to the contrib reactor.

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