While not super high priority (right?) we should maybe try to resolve the shinken complaining of long-lived cherry-picks on the puppetmaster02 for the deployment-prep instance: CRITICAL: deployment-puppetmaster02/Long lived cherry-picks on puppetmaster as it causes CRITICAL: 100.00% of data above the critical threshold [0.0]. Thanks.
The check asks "Is the average number of cherry-picks on the puppet master in the last 48h greater than 0?" If the answer is yes, it goes CRITICAL. The only way to silence it is dropping all the cherry-picks (and leaving them dropped), which is currently not an option. (Or killing the test, which also doesn't seem like a good idea).