CLC-4152 - Change ua.berkeley.edu to bhive.berkeley.edu

https://jira.ets.berkeley.edu/jira/browse/CLC-4152
Merge pull request #2851 from christianv/CLC-4152

CLC-4152 - Change ua.berkeley.edu to bhive.berkeley.edu