Merge "Allow deleting accounts when user is locked" into nyc-dev