DeleteServiceTest: fix 2 broken tests.
HierarchyMoveDatasetTest: fix 6 tests.
ImporterTest: fix 2 failing tests.
AnnotationDeleteTest.java: remove NYI fail.
Merge pull request #3130 from bpindelski/broken_fixes

Reduce no. of broken integration tests.