Merge pull request #163 from amitaibu/162

Fix permissions.
Fix contributor migrate.
Merge pull request #164 from amitaibu/contributor-migrate

Fix contributor migrate.
Merge branch '7.x-3.x' into 162