Merge pull request #1443 from CarlosManias/java-refactor-entitylists-fileservice

Java refactor entitylists fileservice
Activities URL Test
Merge pull request #1446 from markewallace/ActivityUrls

Activities URL Test
Merge remote-tracking branch 'origin/2.0.0-alpha' into java-fileservice-cleanup