small refactoring
Merge branch 'm1.mybatis' into m2.properties