cli now uses AWS_DEFAULT_REGION instead of EC2_REGION
Merge remote-tracking branch 'upstream/master'