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