Second partial merge of the condrv_restructure branch, including additions from revis...