Merge pull request #2 from teralytics/fix_client_address_override_in_upstart_script

if consul_client_address set (in consul.conf), in the upstart script do not set -client flag …

Author: chicofranchico

templates/consul.conf.j2

@@ -24,7 +24,8 @@ script
 {% if consul_dynamic_bind %}
     -bind=$BIND \
 {% endif %}
-{% if consul_client_address_bind %}
+{# In case 'consul_client_address' is set, will only configure it in /etc/consul.conf, not here #}
+{% if consul_client_address_bind and not consul_client_address %}
     -client=$CLIENT_BIND \
 {% endif %}
     -config-dir={{ consul_config_dir }} \