JCLOUDS-774 inconsistent region and zone mappings.

This starts work towards https://issues.apache.org/jira/browse/JCLOUDS-774
> This was very dodgy as it trapped a weird edge case.

I was going to say: why are we special-casing for a proxy error here? Thanks for reverting!