Backporting some changes from production tree

Fixing wrong path for --buildsitemap
Changing --s3-upload to --s3upload