Merge pull request #1932 from bhourigan/issue1931

ec2-upload-bundle uses deprecated parameter

builder/amazon/instance/builder.go

@@ -75,7 +75,7 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, error) {
 			"-s {{.SecretKey}} " +
 			"-d {{.BundleDirectory}} " +
 			"--batch " +
-			"--region {{.Region}} " +
+			"--location {{.Region}} " +
 			"--retry"
 	}