CLDR-17686 change enum.valueOf to enum.forString in a couple of places

[srl295]

• these were causing odd compilation errors on one environment

CLDR-17686

• [ ] This PR completes the ticket.

ALLOW_MANY_COMMITS=true

[srl295]

Deleting maven cache seemed to make this error go away. So, not sure of the cause.

[macchiati]

Please take a pass through PRs to make sure that they are merged before we branch (if there are other merges on the ticket)