meta-telephony.git branch 201705 updated. 2e57eb7866433f5cdfb4458ef23d47e03539d0bf