fix BadParameterValue when passing -private_ip_address to run_instances().
fix changelog conflict
Report errors encountered while committing firewall rules to security groups.
fix merge error
Allow arbitrary arguments to be passed to rsync.