[zdf] Add support for channels
Merge remote-tracking branch 'akretz/master'
[zdf:channel] Simplify (#4427)
release 2014.12.11