Merge pull request #220 from jay-hodgson/release-1.22

merge SWC-456 up from develop
Merge pull request #225 from jay-hodgson/release-1.22

PLFM-1792: patch production to roll back FileEntity support, until we ha...
SWC-473: fix synapse links