am 07148ea2: Merge "Make mkdirAndChown do what it claims to do"
automerge: 7474c77

* commit '7474c77cf80d1e7b718b17071f156b1c99f0f1da':
  Make mkdirAndChown do what it claims to do