+uri.1.7.0
uri: explicitly depend on type_conv since camlp4 is now optional
Merge pull request #2240 from mirage/master

+uri.1.7.0