Merge pull request #942 from dburdick/swc-1069

Swc 1265, 1336 1338
update artifact, remove user preference references, and fix compilation errors
Merge pull request #944 from jay-hodgson/SWC-1350

update synapse artifact, remove user preference references, and fix compilation errors
SWC-1353
Merge pull request #947 from jay-hodgson/release-40

SWC-1353
merge upstream