fix rebuildstaging merge output

was autostaging => foo, is now
origin/master => foo
Merge pull request #3244 from dimagi/fix-merge-output

fix rebuildstaging merge output