Merge pull request #632 from john-hill/PLFM-2143

added named id generator and swapped the worker
Merge pull request #633 from john-hill/PLFM-2143

setting the etag
not sure why this is failing on the build machine, but not in local builds. I don't see how this would make any difference.
Fix build
Merge pull request #639 from xschildw/FIX-BUILD-R11

Fix build r11
Merge pull request #635 from john-hill/PLFM-2120

Plfm 2120
Merge branch 'release-11' into PLFM-2120