Merge pull request #2492 from sleuthkit/ct-release-3.0.0

Merge ct-release-3.0.0 branch into develop branch

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

@@ -963,7 +963,10 @@ public Optional<OsAccount> getWindowsOsAccount(String sid, String loginName, Str
 				throw new OsAccountManager.NotUserSIDException(String.format("SID = %s is not a user SID.", sid));
 			}
 
-			return this.getOsAccountByAddr(sid, realm.get());
+			Optional<OsAccount> account = this.getOsAccountByAddr(sid, realm.get());
+			if (account.isPresent()) {
+				return account;
+			}
 		}
 
 		// search by login name