Yealink cleanup
Merge remote-tracking branch 'origin/yealink' into 3.2-RC