Salt move and notice

You probably want to merge this after saltstack/salt#8352 is merged.