master
7901941: Consolidate test layout
7903989: Default to no error if existing, make parent directories as needed