fixed includes Tokutek/ft-index#211
Merge branch 'bugfixes/tokumx-1.4'