Updated PolicyGenerator to agree with current Ocaml-Topology
Merge to bring my version up to speed