Merge "Reduce memory consumption in Cinder services"