disable deletion of users
remove airtime-demo specific code
Merge branch '2.3.x' into 2.3.x-saas