Fix haproxy service attributes to match recipes (merged from master)