Fixes issue(s) in saltstack/salt repo issue #11096