Revert "Use tarball_basedir for tarball name"

This reverts commit 53a436be15de1de85ef4c505688e87be316dfcf2.
Revert "Revert "Use tarball_basedir for tarball name""

This reverts commit 97309675ac8d24518adbb80224dc8fb13ef8166c.
Use correct dir for setup
Merge branch 'maint/4.0/testing'