Merge "Adjust tests for renaming groupHint to cluster." into rvc-dev am: 6489161fd5

Change-Id: I91768e43fb69c74058b248a03698d6ffedf94f55
tree: 5308a60d74f291d5ff505b12ea93c28951f2aee3
  1. core/
  2. services/
  3. tests/