Replacing APPLE INC. with CABLE TELEVISION LABS INC. in the license header.
Merge pull request #4 from cablelabs/fix-license-cablelabs-not-apple

Replacing APPLE INC. with CABLE TELEVISION LABS INC. in the license head...
Merge pull request #6 from cablelabs/master

Pull updates from ruih/master into cbl_master/plugfest36.