Merge pull request #851 from xschildw/FIX-REL22_MRG

Fix rel22 mrg
Must have forgotten this line during the auth service revision.
Merge pull request #865 from kaysoky/release-23

Stack 23 - Patch on auth service
[PLFM-2359] Add new V2 Wiki service call to get a specific version
Added method to retrieve redirect urls for markdown
Remove redundant "for specific version" methods and add optional version param to service methods
Add methods to synapse client and add to integration tests
Merge pull request #866 from heidiso/release-23-wikiv2

V2 Wiki Service Additions
Merge pull request #867 from heidiso/release-23-wikiv2

Merging "release-23-wikiv2" into release-23
PFLM-2322
Merge branch 'develop' into PLFM-2322
Code review changes (security fix for file handle permissions) for release-23-wikiv2
Merge pull request #874 from heidiso/release-23-wikiv2

V2WikiPage Security fix (Merging into release-23)
Merge pull request #872 from heidiso/release-23-wikiv2

V2WikiPage Security fix for file handle permissions
Added methods that take V1 wikis and use V2 services
Rename new methods
Add to Stub
Added integration tests for new V2 java client methods
Delete commented out code
Merge pull request #879 from heidiso/release-23-wikiv2

[PLFM-2401] V2 Wiki Additions to JavaClient