meta-telephony.git branch 201705 updated. fdbb433446fc698370124fb9444fcbde31c84285