Merge proposals dependent on lp://staging/~abentley/launchpad/revert-enums

lp://staging/~abentley/launchpad/revert-enums has no merge proposals.