add job limits for more users
Merge branch 'ff' into kbase-dev