[mybatis/f19] (4 commits) ...fix build on f20

[gil]

Summary of changes:

  fc2391d... Initial import (#815566). (*)
  2f75bf2... fix build on f20 (*)
  f89fe68... fix build on f20 (*)
  623798d... fix build on f20 (*)

(*) This commit already existed in another branch; no separate mail sent