Merge "Fix DefaultFileNameMap behavior for URL cases involving a fragment."