Merge r1228894 from trunk: rewrite guesses URL or Filesystem in server context, but treats everything as a URL in per-dir context.