Keepalive fix cleanup [neko]#2

rgarcia merged 1 commit intokernel:masterkernel/neko:masterfrom

raiden-staging:masterraiden-staging/neko:masterCopy head branch name to clipboard