Adding options for separate client/server websocket settings
Merge pull request #531 from jprjr/master

Add options for separate client/server websocket settings
SSL detection correction

$protocol always equals 'https' because $_SERVER['HTTPS'] !== 'off' always evaluates to true which causes the shared links to always use https even if the server doesn't use ssl.
Merge pull request #545 from smandon/sma-bugcorrection

SSL detection correction
New action test_upgrade_scripts to ease production
(cherry picked from commit a75f9a4)
Fix WebODF file sanitization
(cherry picked from commit bd1cd3f)
Pixlr have changed their domain to apps.pixlr.com - Fix #500
(cherry picked from commit 5a0187e)
Update SabreDAV to 1.8.10
(cherry picked from commit bbc1137)
Fix #629: false negative alert when moving a file to another workspace with same folder path
(cherry picked from commit 5b1a77f)
Strengthen meta.mount security by passing the password via environment variable instead of the command line. Still an optional parameter as upgrading will require changing sudo file as well.
(cherry picked from commit 5449444)
ActivityMonitor: cap the intervalue by max 32bit integer to avoid GUI hanging if php session.gc_maxlifetime is too big. Should fix #639
(cherry picked from commit 6fefa80)
Add author to the Git commit command, otherwise it can prevent auto-commit
(cherry picked from commit 50fa673)
Fix error moving files between different wrapper
(cherry picked from commit 5025634)
Set update site to https
(cherry picked from commit 2d63ac6)
Fix apache pydio.conf for RPM
(cherry picked from commit 14cdc03)
Typo in SQL UpgradeDB step. Probably non-functionnal in 5.2.3 !
(cherry picked from commit a85eef4)
Fix radio button problem in Role Editor
(cherry picked from commit cdcc459)
Fix WebDAV enabler & password form (close #556)
(cherry picked from commit 5e78246)
Allow WS creation on read-only FS if option CREATE is not set.
(cherry picked from commit ca130b5)
Silently delete failing alert to avoid filling error logs
(cherry picked from commit 357805d)