amazon/*: fix some merge conflicts

builder/amazon/common/state.go

@@ -91,7 +91,7 @@ func InstanceStateRefreshFunc(conn *ec2.EC2, instanceId string) StateRefreshFunc
 			return nil, "", nil
 		}
 
-		i = resp.Reservations[0].Instances[0]
+		i := resp.Reservations[0].Instances[0]
 		return i, *i.State.Name, nil
 	}
 }

builder/amazon/common/step_run_source_instance.go

@@ -310,7 +310,7 @@ func (s *StepRunSourceInstance) Cleanup(state multistep.StateBag) {
 		}
 		stateChange := StateChangeConf{
 			Pending: []string{"pending", "running", "shutting-down", "stopped", "stopping"},
-			Refresh: InstanceStateRefreshFunc(ec2conn, s.instance.InstanceId),
+			Refresh: InstanceStateRefreshFunc(ec2conn, *s.instance.InstanceID),
 			Target:  "terminated",
 		}
 

builder/amazon/ebs/step_stop_instance.go

@@ -40,7 +40,7 @@ func (s *stepStopInstance) Run(state multistep.StateBag) multistep.StepAction {
 	stateChange := awscommon.StateChangeConf{
 		Pending:   []string{"running", "stopping"},
 		Target:    "stopped",
-		Refresh:   awscommon.InstanceStateRefreshFunc(ec2conn, instance.InstanceId),
+		Refresh:   awscommon.InstanceStateRefreshFunc(ec2conn, *instance.InstanceID),
 		StepState: state,
 	}
 	_, err = awscommon.WaitForState(&stateChange)