tested and fixed
smaller timeout
logging
Merge pull request #1382 from john-hill/PLFM-2850

Plfm 2850