fix some file mode bug 755->644
Merge branch '2.2' into 2.3

* 2.2:
  fix some file mode bug 755->644