Merge pull request #642 from john-hill/PLFM-2120

Plfm 2120
Merge pull request #643 from john-hill/PLFM-2120

fix for the build
started collator
added a collate worker
fixed test and added concurent-false to all job details
Merge branch 'develop' into PLFM-2149
Merge pull request #660 from john-hill/PLFM-2149

Plfm 2149