Merge "Fix JobSet getJobsByUser" into oc-dev