Merge of cbl_cpratt/add-resource-removal to cablelabs/retrotfit

For review by Doug & Prasanna