am d40130ab: Merge "Stop clat if it\'s no longer in use." into jb-mr2-dev

* commit 'd40130abbe1cf88665a98ac2d0ec1c30bd089308':
  Stop clat if it's no longer in use.
tree: 83383548affc90860cac5edcc119b45a12d43cb8
  1. core/
  2. services/