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

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

This reverts commit 01c5284b6062846ffafc0daf885db3258d1e8699.