Merge "Explicitly set lib dir permissions during unlink" into jb-dev