[yast/yast-s390] d9d99e: Merge branch 'sw_04' into sw_06