Merge proposals dependent on lp://staging/~thumper/launchpad/recognize-branch-id-stacked-location

1. recognize-branch-id-stacked-location
2. Dependent merge proposals