Use setup's upgrade option when appropriate; reorder prompts

@ruimalheiro, can you test this, along with the latest ka-lite release-0.10.3 branch?