meta-telephony.git branch 201705 updated. 9a3c3d32f55f4522772904f1eea0a01e822fcd48