Merge "Fix crash in isChildDocument when parent is in zip, and child not." into nyc-dev