Merge pull request #122 from jsrain/master

fixed autoupgrade mode handling (bnc#885634)
code de-duplication of recent AUtoYaST fixes (bnc#885634)