QA CLC-4009 server-side, CLC-4005 client-side

QA versions of https://github.com/ets-berkeley-edu/calcentral/commit/6068ff8b2d38da13e9956b15d3ba1dce81eafd4f and https://github.com/ets-berkeley-edu/calcentral/commit/d13e600cfb8a79a0ac505ccaed2947f172c669c4