openflow: Fix docsting for keepalive
openflow: Add --timeout option to keepalive
Merge branch 'betta' into carp