Merge "Formatting applied to aaa's distribution-karaf bundle"