Merge "Skip stop if keepalive is already in stopping state"
tree: 8cde8ea9308f9b3467fa48be6df00732ef7da69a
  1. core/
  2. services/
  3. tests/