Fixed trailing comma bug

Depending on the options specified, there could be a trailing comma which is invalid JSON and prevented consul from starting. Lame but easy solution was to make a required configuration be the last one and never have a trailing comma and made sure all other configs do end in a comma.

templates/consul.json.j2

@@ -19,9 +19,8 @@
   "advertise_addr": "{{ consul_advertise_address }}",
 {% endif %}
   "datacenter": "{{ consul_datacenter }}",
-  "rejoin_after_leave": {{ "true" if consul_rejoin_after_leave else "false" }},
 {% if consul_is_server and consul_bootstrap is defined %}
-  "bootstrap": {{ "true" if consul_bootstrap else "false" }}
+  "bootstrap": {{ "true" if consul_bootstrap else "false" }},
 {% endif %}
 {% if consul_is_server and consul_bootstrap_expect is defined %}
   "bootstrap_expect": {{ consul_bootstrap_expect }},
@@ -30,6 +29,7 @@
   "encrypt": "{{ consul_encrypt_key }}",
 {% endif %}
 {% if consul_watches is defined %}
-  "watches": {{ consul_watches|to_nice_json }}
+  "watches": {{ consul_watches|to_nice_json }},
 {% endif %}
+"rejoin_after_leave": {{ "true" if consul_rejoin_after_leave else "false" }}
 }