Fix application telemetry instance_id passthrough (closes #11)

Author: jbeemster

templates/config.json.tmpl

@@ -154,7 +154,6 @@
     "secure": ${telemetry_secure}
     "userProvidedId": "${telemetry_user_provided_id}"
     "autoGeneratedId": "${telemetry_auto_gen_id}"
-    "instanceId": "$${TELEMETRY_INSTANCE_ID}"
     "moduleName": "${telemetry_module_name}"
     "moduleVersion": "${telemetry_module_version}"
   }

templates/user-data.sh.tmpl

@@ -13,8 +13,8 @@ sudo docker run \
   --log-opt max-size=10m \
   --log-opt max-file=5 \
 %{ endif ~}
-  -e 'JAVA_OPTS=${java_opts}' \
-  -e "TELEMETRY_INSTANCE_ID=$(get_instance_id)" \
+  -e 'JAVA_OPTS=-Dconfig.override_with_env_vars=true ${java_opts}' \
+  -e "CONFIG_FORCE_telemetry_instanceId=$(get_instance_id)" \
   snowplow/rdb-loader-snowflake:${version} \
   --config ${config_b64} \
   --iglu-config ${iglu_resolver_b64}