JCLOUDS-774 cleanup derived location suppliers and backfill test for inconsistent region and zone mappings.
Revert 428b2bd2ea2d73354e15ffad52516105b15576cd as this hides inconsistency between regions and zones.