Merge "Stop clat if it's no longer in use." into jb-mr2-dev
tree: 83383548affc90860cac5edcc119b45a12d43cb8
  1. core/
  2. services/