DTCP fixes. Pull updates from master into cbl_master/plugfest36.

DTCP fixes. Pull updates from master into cbl_master/plugfest36.