Merge from trunk, including local_info.cpp and changeset 73402 fixes for #7534, missing POSIX close()