Merge changes from topic "sfdo" into main

* changes:
  [sfdo] Add the forceClientComposition command to sfdo.
  [sfdo] Fix minor formatting issues.