Merge changes from topic "revert-17060491-revert-17008428-cherrypick-multi-provider-cloudsearch-2yrjp5zxz1-WHCUFOAJWF-WKGCSSGIPI" into tm-dev

* changes:
  Fixing multi provider support in AbstractMasterSystemService
  Revert "Revert "Adding multiple provider support in AbstractMast..."