Revert "Revert "Revert "Revert "Merge remote-tracking branch 'apache/master'""""

This reverts commit 55d33c9a8865aa42ab5fa1235aeaf497d3c463eb.
Revert "Revert "Use the new make-distribution.sh maven option passing on packserv""

This reverts commit d4bbcc962d78d565fe6a96e0e26a5cbf64537c05.
Merge pull request #14 from Shopify/revertrevertrevertrevert

Revertrevertrevertrevert