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