change order in mode initialization so that selected Upgrade entry in boot menu does not override AutoUpgrade (bnc897044)