Fix git lp branch to --set-upstream-branch=launchpad/+upstream

This allows 'git branch -d' to really work after the branch is
somehow (externally) merged into launchpad/+upstream and fetched

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>