Merge branch 'release-v0.5.4' of github.com:matrix-org/synapse
Fix bug while generating the error message when a file path specified in the config doesn't exist
Bump version and change log
Merge branch 'hotfixes-v0.5.4' of github.com:matrix-org/synapse into develop