Fixed indent and timeouts by keepalives
Merge branch 'feature/common' of https://github.com/dimm0/scidrive into feature/common