To avoid conflict call, rename classes to make IBM indexer service up.

Ashwani Pandeyrequested to merge
cherry-pick-1f660096 into release/0.23

To avoid conflict call, rename classes to make IBM indexer service up.

See merge request !616 (merged)

Merge request reports