TNL-328 Cohort/server display auto

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

I chatted 1-on-1 with @jimabramson to explain my reasoning here.  He was going to take another look at this code and state his opinion (which may be the same as before or now different).