Remove unneeded kwargs left in during merge conflict resolution
Remove unneeded kwargs left in during merge conflict resolution

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt