Merge branch 'master' into no_zmq

Conflicts:
	src/pydio/main.py
restored run_ping_server_test
no run_zmq_smoke_test
more info
Merge remote-tracking branch 'origin/master' into no_zmq

Conflicts:
	src/pydio/main.py
	src/pydio/test/diagnostics.py
remove orig copies