Merge proposals dependent on lp:~tjoneslo/akiban-server/fix-bug-1163967

lp:~tjoneslo/akiban-server/fix-bug-1163967 has no merge proposals.