Adapt to change in yojson and cmdliner#6

FardaleM wants to merge 4 commits intocyborgize:mastercyborgize/es-cli:masterfrom

FardaleM:masterFardaleM/es-cli:masterCopy head branch name to clipboard