Merge branch 'paramsessionkey' into upstream-4.0-stable
fix bug 899 and fix connection timeout value to get it from the vishnu config file
Merge remote-tracking branch 'Amine/4.0-stable' into upstream-master