merge from develop

...ngs/java/src/org/sleuthkit/datamodel/AbstractContent.java

.../java/src/org/sleuthkit/datamodel/HostAddressManager.java

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

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

...ava/src/org/sleuthkit/datamodel/LocalFilesDataSource.java

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

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

...va/src/org/sleuthkit/datamodel/OsAccountRealmManager.java

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

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

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

...ngs/java/src/org/sleuthkit/datamodel/TskCaseDbBridge.java

bindings/java/test/org/sleuthkit/datamodel/ArtifactTest.java

...ings/java/test/org/sleuthkit/datamodel/OsAccountTest.java