[Olena-patches] olena: olena-2.0-586-g8255583 Fix merge conflicts with ICDAR13 recognition table work from Roland