Merge changes from topic 'vlab-oss'

* changes:
  Add OSS Tools into the CICD cluster model
  Add ability to run tests for specific salt-masters