Merge "Modify test-salt-models-pipeline"