CLC-3721 Expire more user-specific things
Merge pull request #2505 from ctweney/clc-3721

CLC-3721 Expire more user-specific things