Updates for new ocaml-packet and ocaml-openflow changes