AI-579 Starting migrating unit tests to work against (partially) migrated resources
Merge branch 'version4' of github.com:bedatadriven/activityinfo into version4