Cherry-pick "fix: cognito user pool account recovery issue" into release/0.19
This fixes cognito issue that arises during deployment
Error: updating Cognito User pool (us-east-1_GT561jI9M): InvalidParameter: 1 validation error(s) found.
Edited by Abhishek Patil