bugfix for wait_until in reboot_and_wait, .vop template for service descriptor plugins