Merge pull request #715 from brucehoff/PLFM-2117

Plfm 2117
Merge branch 'develop' into PLFM-2117
PLFM-2117 synapse client
PLFM-2117; integration tests