Merge "Fix docker-login to conditionally use -e"