Merge "Fix bug with jobservice context giving wrong value" into mnc-dev