Merge "Add salt-master-credentials to periodic jobs"