improve messages to user and prevent errors when shutting down a
pipeline already shutdown
Merge remote-tracking branch 'origin/8.30.prod' into 8.30