Minor fix for DSC-444
Merge pull request #617 from nla/nn-dsc-444

Minor fix for DSC-444
fixed the jobitem unit test.
Merge pull request #618 from nla/fix-unit-tests

fixed the jobitem unit test.
Merge branch 'master' into bug/acm-dsc-389-3