WL-3663 : Use siteId in Contact Us tool

If there isn't a persistent session (eg user is blocking cookies) and they are on the error site then I think siteId will become null and then will NPE when we try to find that site.