re-integrating branch cdmlib/3.x-unitils-upgrade