Fix --unset-upstream handling
Fix --unset-upstream handling

This fixes problems with the --unset-upstream handling added in the
previous commit.

See https://github.com/saltstack/salt/pull/31245#issuecomment-185568476
for more info.

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