Merge remote-tracking branch 'upstream/master' into ui-tests
Merge branch 'ui-tests'
CLC-3980 Adjust columns that show in ccadmin for calendar queue and log tables
CLC-4021: fixes for failing Selenium tests
CLC-4021: fixes for failing Selenium tests
CLC-4021: fixes for failing Selenium tests, part 2
Merge pull request #2739 from ctweney/clc-3980

CLC-3980 Adjust columns that show in ccadmin for calendar queue and log tables
Merge pull request #2740 from christianv/CLC-4018

CLC-4018: Replace ng- with data-ng-
CLC-4022 Bearfacts proxies should clean up with the UserCacheExpiry
Ripping out files not intended for previous commits
Merge pull request #2742 from pfarestveit/my-fin-fixes

CLC-4021: fixes for failing Selenium tests
Merge pull request #2743 from ctweney/clc-4022

CLC-4022 Bearfacts proxies should clean up with the UserCacheExpiry