XD-1331 Make Batch Job Restarts Work using Single Node

* Improve `ExpandedJobParametersConverter` so that `JobParameters` can be converted to JSON
* Add tests
XD-1331 Code review changes
XD-1331 Code Review Changes - Add Restart Parameter