Implemented consumer cancellation notification support.
Merge branch 'master' into ccn