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

Change-Id: Ic6290a0468ae02697fbb2a21617596c7d6af604f