Merge proposals dependent on lp://staging/~stewart/drizzle/update-innobase-and-read-committed-fix-lockwaittimeout

1. update-innobase-and-read-committed-fix-lockwaittimeout
2. Dependent merge proposals