Rebase onto remote branches should use remote name

[andys8]

There is a bug in the implementation where currently rebase onto origin/master is rebasing on master instead.

[andys8]

Closed by e869b36