Merge "Refactor test-salt-models-pipeline"