Let's test this rebase thing.
Merge pull request #5253 from faerindel/squash_tests

Adds buildable and upgradeable PSUs (battery racks, not SMES).