Merge proposals dependent on lp://staging/~stewart/drizzle/dead-index-type-removal-from-proto

1. dead-index-type-removal-from-proto
2. Dependent merge proposals