pin Upload to 1.7, so we don't have any issues with changes for 2.0
updated submodule references