Fix issue where loading savegames loses upgrade effects. Also fix duplicate
loading of map labels. Based on patch by Althalus. Closes ticket:4215.