Tweaks to haproxy base to use different set of defaults based on expected file names.  Various other changes / tunings