Merge remote-tracking branch 'upstream/master' into ui-tests
Merge branch 'ui-tests'
CLC-4021: fixes for failing Selenium tests
CLC-4021: fixes for failing Selenium tests
CLC-4021: fixes for failing Selenium tests, part 2
Ripping out files not intended for previous commits
Merge pull request #2742 from pfarestveit/my-fin-fixes

CLC-4021: fixes for failing Selenium tests