am 24ba3234: Merge "Do not delete stacks that are not empty." into klp-dev

* commit '24ba3234caa27185aa34aab5b88190f85f9a8d75':
  Do not delete stacks that are not empty.