Merge branch 'master' of git@github.com:apache/sling-parent.git