check
Merge pull request #1290 from john-hill/PLFM-2790

check
Merge pull request #1293 from john-hill/PLFM-2790

check
removed test
Merge pull request #1295 from john-hill/bad-test

Plfm 2789
Merge pull request #1291 from jay-hodgson/SWC-1420

Swc-1420: retry a few times (with exponential backoff) if service responds with 503
pull from develop and fix test