r8836: bring in SWAT install changes and volker uninit'd variable fixes