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

PLFM-2539
check
check
PLFM-2541
PLFM-2541
check
PLFM-1963
PLFM-1963
PLFM-1963
Merge pull request #1066 from brucehoff/PLFM-2541

Plfm 2541
Merge pull request #1067 from brucehoff/PLFM-1963

PLFM-1963
PLFM-2327
Merge pull request #1068 from brucehoff/PLFM-2327

PLFM-2327
check
merged
Merge pull request #1069 from john-hill/PLFM-2377-e

Plfm 2377 e
Fixed test
Merge pull request #1070 from john-hill/PLFM-2377-e

Fixed test
check