some fixes to yast updates with conflicts
Merge pull request #145 from aplanas/master

Decrease the TO for the bootloader
Merge pull request #146 from os-autoinst/coolo_yast_upgrade

some fixes to yast updates with conflicts
add valid option to dolphin test
Merge pull request #147 from nilxam/update_1028

add valid option to dolphin test