use catalogRegion instead of region for filters

[hiltol]

No description provided.

[luisarojas]

Summary of changes (for our records, and my own understanding):

• Replace current ‘region’ attribute filter with catalogRegion instead. This property has a more accurate values, especially in cases where the some region values are stored under a different name in the previous ‘region’ attribute used (e.g. eu-de showing as eu-central).
  • Tests have also been updated to use eu-de instead of us-south as input.
• Add logic such that, if an entitlement is specified, then assume OCP licensing is already covered. Only use pricing that is not included in the OCP charges.