Added timeout to stats
added timeout parameter to checkconnection function.
Merge remote-tracking branch 'origin/changes-for-civitatis' into timeout-in-checkconnection
Merge branch 'timeout-in-checkconnection' into changes-for-civitatis