Merge "pbx.c: Fix handling of '-' in extension name and callerid"