PLFM-2539
Merge pull request #1059 from brucehoff/release-30

PLFM-2539
check
PLFM-2567
Merge pull request #1072 from brucehoff/PLFM-2567

PLFM-2567
Merge branch 'release-30' into develop
Check
switch back to AWS RDS
code review changes
fixed tests
Merge pull request #1073 from john-hill/PLFM-2377-f

Plfm 2377 f