check
Check
switch back to AWS RDS
code review changes
fixed tests
Merge pull request #1073 from john-hill/PLFM-2377-f

Plfm 2377 f