SaltStack 0.17.2

Closes #23963.

Signed-off-by: Misty De Meo <mistydemeo@gmail.com>
Merge branch 'origin'

* origin:
  SaltStack 0.17.2