Merge "Allow mkdir() race to succeed." into jb-mr1-dev