code de-duplication of recent AUtoYaST fixes (bnc#885634)
Merge pull request #123 from jsrain/master

code de-duplication of recent AUtoYaST fixes (bnc#885634)