Fix UpgradeRules not upgrading maps.
Remove duplication between Immobile and Mine.
Merge pull request #4919 from pchote/mine-fixup

Remove duplication between Immobile and Mine.