Merge "Rename salt -> saltstack repository to fix inconsistency with image"