Check upgrades when checking requires_power in MenuPowers

Fixes #1029
Merge pull request #1033 from dorkster/menupowers

Check upgrades when checking requires_power in MenuPowers
Merge remote-tracking branch 'upstream/master'