IAM and RDS check bug fixes for setup.form.inc