Fixed permissions of unit tests
Merge branch '2.5.x' into 2.5.x-saas