Classpath urls should still use expand_path to properly canonicalize the path.  This fixes no reported issue
Merge with 1.7