Merge "resist umask changes, make dirs 0711"