Pass any --innodb* options to bootstrap as well
Backported to v1, where also a removal of --loose-skip-innodb is needed