refactor the cleanup containers
refactor the cleanup containers

TrivialFix
Sort the containers, remove *_data ones, etc.

Change-Id: Ic7923828517da954e7c8802d6cf5918e425df255

stackforge/kolla,limamauricio/mykolla,mandre/kolla,coolsvap/kolla,intel-onp/kolla,GalenMa/kolla,toby82/kolla,intel-onp/kolla,mandre/kolla,rahulunair/kolla,nihilifer/kolla,dardelean/kolla-ansible,limamauricio/mykolla,mrangana/kolla,mrangana/kolla,openstack/kolla,mandre/kolla,toby82/kolla,nihilifer/kolla,dardelean/kolla-ansible,stackforge/kolla,dardelean/kolla-ansible,tonyli71/kolla,coolsvap/kolla,openstack/kolla,stackforge/kolla,negronjl/kolla,rahulunair/kolla,tonyli71/kolla,limamauricio/mykolla,negronjl/kolla,negronjl/kolla,coolsvap/kolla,toby82/kolla,GalenMa/kolla