[yast-commit] [yast/yast-yast2] 489b2e: Further rewrites to fix failing tests