WL-3444 : Adding the original site to the tool session

Putting a full Site object into the session isn't good. We have site objects that can be 1MB+ and once it's in the session it's difficult to get rid of and easy to leak.