Merge proposals dependent on lp:~stewart/drizzle/bug610974-rename-of-archive-returns-incorrect-table-name-in-proto

1. bug610974-rename-of-archive-returns-incorrect-table-name-in-proto
2. Dependent merge proposals