Merge "Move keepalive constants to their right place"
tree: c7bfdeb15e5952f5c7fccef04e95c73f4350169a
  1. core/
  2. services/
  3. tests/