Merge proposals dependent on lp://staging/~billy-olsen/horizon/icehouse-fix-lp1476417

lp://staging/~billy-olsen/horizon/icehouse-fix-lp1476417 has no merge proposals.