More ActivityService unit test fixes
Merge pull request #1528 from markewallace/BugFixesTake4

Bug fixes take4
Merge remote-tracking branch 'origin/2.0.0-alpha' into java-fix-tests-and-cleanup