[yast-commit] [yast/yast-yast2] d004e4: backport from master