fixed more jpf errors
Merge branch 'robDev' into workload