Builder: reformat env var loading routines; Make amazon uploads optional