Fix EMR endpoint
Merge pull request #2750 from boto/emr-fix

Fix EMR endpoint. Fixes #2750.