closes #14544
Merge pull request #14618 from gtmanfred/clean-salt-bootstrap

closes #14544