PLFM-2586
PLFM-2282
PLFM-2282
PLFM-2299
PLFM-2299
merging develop into feature branch
PLFM-2282
Merge pull request #1133 from brucehoff/PLFM-2282

PLFM-2282
Merge branch 'develop' into PLFM-2299
PFLM-2299
PFLM-2299
Merge pull request #1125 from brucehoff/PLFM-2586

PLFM-2586
Merge pull request #1134 from brucehoff/PLFM-2299

PLFM-2299
changed try/catch in integration test for robustness