#2566: Re-committed import memory leak fix with the addition that it corrects a tread starvation race condition.  Also during testing I discovered a data structure in LibraryMonitor not being locked although it was used by a thread-safe function.  This patch also corrects that.  In essence, this patch is a replacement for r2371 and r2374 with code fixes.