Merge "Require directory names to end with a trailing / in ZIP." into nyc-dev