Add @Primary to locate 'the' token services
Harmonize json-path dependencies