AWS fixes

Professional services aws fixes for RDS and VPC removal