Merging job router developments into master branch

I found no conflicts for merging the job router changes into master. The configs of dev branch are already working on ekpbms1...