Merge remote-tracking branch 'upstream/release-4.6.7' into dynamic-account-types

bindings/java/src/org/sleuthkit/datamodel/BlackboardAttribute.java

@@ -1312,6 +1312,9 @@ public enum ATTRIBUTE_TYPE {
 				TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING),
 		TSK_ICCID(130, "TSK_ICCID", //NON-NLS
 				bundle.getString("BlackboardAttribute.tskIccid.text"),
+				TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING),
+		TSK_THREAD_ID(131, "TSK_THREAD_ID",
+				bundle.getString("BlackboardAttribute.tskthreadid.text"),
 				TSK_BLACKBOARD_ATTRIBUTE_VALUE_TYPE.STRING);
 
 		private final int typeID;

bindings/java/src/org/sleuthkit/datamodel/Bundle.properties

@@ -175,6 +175,7 @@ BlackboardAttribute.tskMacAddress.text=MAC Address
 BlackboardAttribute.tskImei.text=IMEI
 BlackboardAttribute.tskImsi.text=IMSI
 BlackboardAttribute.tskIccid.text=ICCID
+BlackboardAttribute.tskthreadid.text=Thread ID
 AbstractFile.readLocal.exception.msg4.text=Error reading local file\: {0}
 AbstractFile.readLocal.exception.msg1.text=Error reading local file, local path is not set
 AbstractFile.readLocal.exception.msg2.text=Error reading local file, it does not exist at local path\: {0}