After the putback of 7088173, we need a few more changes:

1. There are some functions passing around JavaHome value for the deploy.dll, which is no longer used for those functions
2. The unregistering of the Family key was out of order during the setup
3. Thomas indicated that calling of deploy.dll should be done as the last thing during uninstall