Modify merge_stable_to_st and pull_upstream_stable to take a branch arg

This is because Qt changed their branching scheme to use actual version
numbers rather than terms like stable/dev

Change-Id: Ice2aae91bfb4a1fa5e2237b2a37e6ea34038ed5b