Fixes: #2229 Adding ondemand handling to OPSI