Fix js_of_ocaml opam
Fix eliom opam
Merge pull request #2083 from Drup/master

Add camlp4 for eliom and js_of_ocaml.