Merge proposals dependent on lp://staging/~stewart/drizzle/embedded-innodb-disable-innobase-build

1. embedded-innodb-disable-innobase-build
2. Dependent merge proposals