ICAP-avscan for Java and C# merged. Major cleanup of c#