Backport to folsom attached.
The fix is the same, but the test had to be revised for folsom (most importantly, removed domain_id and user's tenancy).
Backport to folsom attached.
The fix is the same, but the test had to be revised for folsom (most importantly, removed domain_id and user's tenancy).