Move logic to modify catalog params to CatalogGenerator
Add utility method to send Serf events and queries