Revert "Ignore heartbeats lock fails"

It seems that there are at least two level of ruby-stomp brokenness and
the fact that the mutex in original commit is locked actually means
there is no heartbeat received in time and we need to do something about
this.

This reverts commit b50241a7b2.

Closes-Bug: #1644618
Change-Id: I8351abaf0078b094bff2aa20994575c15aec213b

cloud-init-templates/cloud_config_centos.jinja2

@@ -82,7 +82,6 @@ mcollective:
     plugin.rabbitmq.pool.1.user: {{ mcollective.user }}
     plugin.rabbitmq.pool.1.password: {{ mcollective.password }}
     plugin.rabbitmq.heartbeat_interval: 30
-    plugin.rabbitmq.max_hbrlck_fails: 0
 {% endif %}
     factsource: yaml
     plugin.yaml: /etc/mcollective/facts.yaml

cloud-init-templates/cloud_config_fuel_9.0_ubuntu.jinja2

@@ -82,7 +82,6 @@ mcollective:
     plugin.rabbitmq.pool.1.user: {{ mcollective.user }}
     plugin.rabbitmq.pool.1.password: {{ mcollective.password }}
     plugin.rabbitmq.heartbeat_interval: 30
-    plugin.rabbitmq.max_hbrlck_fails: 0
 {% endif %}
     factsource: yaml
     plugin.yaml: /etc/mcollective/facts.yaml

cloud-init-templates/cloud_config_ubuntu.jinja2

@@ -82,7 +82,6 @@ mcollective:
     plugin.rabbitmq.pool.1.user: {{ mcollective.user }}
     plugin.rabbitmq.pool.1.password: {{ mcollective.password }}
     plugin.rabbitmq.heartbeat_interval: 30
-    plugin.rabbitmq.max_hbrlck_fails: 0
 {% endif %}
     factsource: yaml
     plugin.yaml: /etc/mcollective/facts.yaml

contrib/fuel_bootstrap/files/trusty/etc/mcollective/server.cfg

@@ -21,7 +21,6 @@ plugin.rabbitmq.pool.1.port = 61613
 plugin.rabbitmq.pool.1.user = mcollective
 plugin.rabbitmq.pool.1.password = marionette
 plugin.rabbitmq.heartbeat_interval = 30
-plugin.rabbitmq.max_hbrlck_fails = 0
 
 # Facts
 factsource = yaml

contrib/fuel_bootstrap/files/xenial/etc/mcollective/server.cfg

@@ -21,7 +21,6 @@ plugin.rabbitmq.pool.1.port = 61613
 plugin.rabbitmq.pool.1.user = mcollective
 plugin.rabbitmq.pool.1.password = marionette
 plugin.rabbitmq.heartbeat_interval = 30
-plugin.rabbitmq.max_hbrlck_fails = 0
 
 # Facts
 factsource = yaml