Merge branch 'master' into trentm/types-spanoptions-starttime

Author: trentm

test/integration/api-schema/apm-server-schema/error.json

@@ -179,7 +179,7 @@
               ],
               "properties": {
                 "encrypted": {
-                  "description": "Encrypted indicates whether a request was sent as TLS/HTTPS request.",
+                  "description": "Encrypted indicates whether a request was sent as TLS/HTTPS request. DEPRECATED: this field will be removed in a future release.",
                   "type": [
                     "null",
                     "boolean"

test/integration/api-schema/apm-server-schema/transaction.json

@@ -178,7 +178,7 @@
               ],
               "properties": {
                 "encrypted": {
-                  "description": "Encrypted indicates whether a request was sent as TLS/HTTPS request.",
+                  "description": "Encrypted indicates whether a request was sent as TLS/HTTPS request. DEPRECATED: this field will be removed in a future release.",
                   "type": [
                     "null",
                     "boolean"