Merge proposals dependent on lp://staging/~djfroofy/bafload/refactoring

lp://staging/~djfroofy/bafload/refactoring has no merge proposals.