Merge "Read the correct parameters for Jobscheduler" into oc-dr1-dev