Merge proposals dependent on lp://qastaging/~michael.nelson/launchpad/443353-api-builds-from-private

1. 443353-api-builds-from-private
2. Dependent merge proposals