Prefer actions over terminal commands

[btkostner]

Right now, we have a shut down command. Sadly, when you type "shutdown" the first option that shows up is the terminal shutdown command instead of the action. It should show the action first.

[cassidyjames]

Re-opened since we reverted the fix due to regressions