[merge][#261315][1.7] RemoteBranch sets up stacking (more) correctly

[Bundle Buggy]

Bundle Buggy has detected this merge request.

For details, see: 
http://bundlebuggy.aaronbentley.com/project/bzr/request/%3Ce01316480809151614r6c795596k609ef13ac5a1fec6%40mail.gmail.com%3E
Project: Bazaar