CORE-4081: removed some dead code
CORE-4081: replace spaces in fAPI job names with underscores
Merge branch 'dev' into 1.8