Update CLAVIN-rest to use CLAVIN 2.0