Changed the names of the catalog debugging files from new/old-catalog.* to catalog-new/old.*
Updated the catalog hash debugging code to use the same UUID for all 5 generated files for a given host
Munge the edge relationships and resource parameters to make diffing the
EDN files easier
Minor change to an acceptance test helper method name