Merge proposals dependent on lp://staging/~michael.nelson/launchpad/567922-binarypackagebuild-new-table-8

1. 567922-binarypackagebuild-new-table-8
2. Dependent merge proposals