Merge proposals dependent on lp://staging/~wgrant/launchpad/bug-549907-stop-using-slave-build-id

1. bug-549907-stop-using-slave-build-id
2. Dependent merge proposals