Description of problem:
RHOSP13z5 or later prevent to access haproxy stats because of commit 3f8ce6fd96bc4f28a052b4c87a19b4b152734091.

The commit overwrites tripleo.haproxy.firewall_rules.
However, the parameter is also used at puppet/services/haproxy.yaml.

~~~
outputs:
  role_data:
    description: Role data for the HAproxy role.
    value:
      service_name: haproxy
      monitoring_subscription: {get_param: MonitoringSubscriptionHaproxy}
      config_settings:
        map_merge:
          - tripleo.haproxy.firewall_rules:
              '107 haproxy stats':
                dport: 1993
~~~

By the commit, users cannot access to haproxy stats.

Version-Release number of selected component (if applicable):
Current T-H-T.

How reproducible:
Every deployment

Steps to Reproduce:
1.
2.
3.

Actual results:
'iptables -nvL' doesn't contain 107 proxy stats rules for ipv4 and ipv6.

Expected results:
'iptables -nvL' contains 107 proxy stats rules for ipv4 and ipv6.

Additional info: