Port from mainline changes to fix cdbq shutdown memory leak
Merge pull request #500 from Juniper/meghb_cdbq_ml

Port from mainline changes to fix cdbq shutdown memory leak