INT-1897: Refactoring for ChannelInterceptors

JIRA: https://jira.springsource.org/browse/INT-1897