TNL-328 Cohort/server display auto

[TNL-180](https://openedx.atlassian.net/browse/TNL-180)

Note to reviewers: The XBlockAcid tests have been moved to their own file.