CLC-4159 Drop the is_test_user? feature
Merge pull request #2963 from raydavis/raywip

CLC-4159 Drop the is_test_user? feature