fix failing tests
Fix compat class

The compat class was relying on the defined() function
to determine if things were in the catalog. This is
parse order dependant and thus a bad idea.

A new version has been written that uses resource
collectors to override the config options that have
been changed.
Clean haproxy class

This commit removes a couple of unused parameters