Fix Issue 7371, add echocanceller line in system.conf generation and 7360
address comments from code review
Merge branch 'release/2.11' into develop

Conflicts:
	module.xml