Merge "Fix JobSet getJobsByUser" into oc-dev
am: b6d30e1404

Change-Id: I40b8919a21da6592e6ad561da2dad7878448ad2e