Merge pull request #121 from jsrain/master

don't check S/390 partitioning on upgrade (bnc#886604)
fixed autoupgrade mode handling (bnc#885634)
Merge remote-tracking branch 'upstream/master'