Fixes #5414: Adds upgrade lib to installer, more installer cleanup
Installer cleanup
Fix small installer bugs
Merge pull request #5415 from mrclay/5414

Fixes #5414: Adds upgrade lib to installer, more installer cleanup