AthenaServices: Fix duplicate clids.

Scott Snyderrequested to merge
ssnyder/athena:clid.AthenaServices-20210923 into master

Fix a couple duplicate clid values in classes used for tests.

Merge request reports