Fix endpoint config for emr

These are based on endpoint prefix.  This means that we were
not creating the proper endpoints for emr, which would fail
SSL cert validation in py2.6.  This was caught by an integration
test that was recently added that happened to use EMR.
Merge branch 'fix-emr-endpoints' into develop

* fix-emr-endpoints:
  Fix endpoint config for emr