Merge branch 'integration' into pt-geo

Author: yachang

cmd/etl_worker/app-ndt-prod.yaml

@@ -39,4 +39,5 @@ env_variables:
   MAX_WORKERS: 20
   BIGQUERY_PROJECT: 'measurement-lab'
   BIGQUERY_DATASET: 'public'
+  ANNOTATE_IP: 'true'
   # TODO add custom service-account, instead of using default credentials.

cmd/etl_worker/app-ndt-staging.yaml

@@ -45,4 +45,5 @@ env_variables:
   MAX_WORKERS: 25
   BIGQUERY_PROJECT: 'mlab-staging'
   BIGQUERY_DATASET: 'staging'
+  ANNOTATE_IP: 'true'
   # TODO add custom service-account, instead of using default credentials.