Converted oauth client and the uritemplate module to 3.x grammar