Ensure we set the default storage engine to innodb.

Keystone doesn't seem to currently work with
myisam so ensure that we set it to innodb which
is the better of the two anyway.

Change-Id: Ia1db18c1f45f159fc29765dce21fbca79db24a0d
Merge "Ensure we set the default storage engine to innodb."