/distribution/beaker/setup: allow merging with base ref, instead of just checking out

Also added some strategic rlDie calls, to make the task fail faster if
something goes bad.

Change-Id: Ia1bc6521d20bfc63e3187bc537a785cb852e26d4
Merge "/distribution/beaker/setup: allow merging with base ref, instead of just checking out" into develop