Merging cbl_pmodem/dtcp-mpegps branch to cablelabs/master.

Squashed commit of the following:

commit 0d011d093d265f0043a54d8c0fa55a11d62e969d
Author: Prasanna Modem <prasanna@ecaspia.com>
Date:   Tue Jan 14 02:21:16 2014 -0800

    Addressed pull request review comments. cleaned up white spaces.

commit 26765016c2512f83a90180469d704f84252952bd
Merge: 5baf633 fb9a2d7
Author: Prasanna Modem <prasanna@ecaspia.com>
Date:   Mon Jan 13 23:38:48 2014 -0800

    Merge branch 'cablelabs/master' of github.com:cablelabs/rygel into cablelabs/master

    Conflicts:
    	src/media-engines/odid/odid-data-source.vala

commit 5baf633e980d90816c1b2620354b3c56ba58ec24
Author: Prasanna Modem <prasanna@ecaspia.com>
Date:   Mon Jan 13 23:18:57 2014 -0800

    Changes to support DTCP for MPEG PS.