[CHE-167b] Merge Dev and Add Back AWS Health Check

[seantokuzo]

Description

You know what it do

...PR Template fix snuck in there for some reason

Jira Task

N/A

Testing Instructions

run test

Checklist

All Team Members

• I added a descriptive title to this PR.
• I filled out the Description, Jira Task, and Testing Instructions sections above.
• I added or updated [Jest unit tests]for any changes to components, server-side controllers, etc.
• I ran npm run docker-test in my local environment to check that this PR passes all unit tests.
• I did a quick check to make sure my code changes follow the recomended style guide.