some fixes to yast updates with conflicts
Merge pull request #146 from os-autoinst/coolo_yast_upgrade

some fixes to yast updates with conflicts