Merge "Moved saltstack trusty repo to upstream from mcp."