TDQ-9756 resolve conflict.
TDQ-9756 delete the consumers and move initPreferences(...) in CWMPlugin
TDQ-9756 Replace consumer xml with java code.
Merge branch 'maintenance/5.6'