Resolve - https://github.com/saltstack/salt/issues/14604
Merge pull request #14764 from saltstack/bp-14607

Backport #14607 to 2014.7