Portings from v6r10
Merge pull request #1735 from fstagni/fixesCompatibilityInnoDB

[v6r9] Portings from v6r10 - high priority
v6r9p28
Merge remote-tracking branch 'upstream/rel-v6r9' into rel-v6r9
v6r10-pre16
Merge remote-tracking branch 'upstream/rel-v6r10' into rel-v6r10
Conflicts resolved with rel-v6r9