SWC-1073: performance improvement, and tests
with synapse artifact update
code review fixes
Merge pull request #728 from jay-hodgson/SWC-1073

SWC-1073:  Portal-side updates to utilize work done in PLFM-2248