Merge proposals dependent on lp://staging/~chromakode/boots/refactor-api

lp://staging/~chromakode/boots/refactor-api has no merge proposals.