Merge pull request #4360 from cjshmyr/crates

CrateSpawner changes
Initial support for individual unit upgrade crates