rename package from com/onflapp package to java/org/apache/sling/additions
Merge remote-tracking branch 'upstream/master'