Merge "configfs is special; don't delete dir contents." into nyc-dev