Add initial support for user expiry via user state
updated version changed to correct current codename
Merge pull request #10916 from darrelclute/user-state-updates

Add initial support for user expiry via user state