CLC-4021: fixes for failing Selenium tests, part 2