Fixed merge conflict
start to refactor get_rms_json
Added finished jobs from last n timeunit
Show jobids in jobinfo
Add task id to jobs in jobinfo