JCLOUDS-774 cleanup derived location suppliers and backfill test for inconsistent region and zone mappings.