change order in mode initialization so that selected Upgrade entry in boot menu does not override AutoUpgrade (bnc897044)
added missing hashtag
removed obsolete FIXME
Merge pull request #296 from jsrain/master

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