Merge "basic-pbx: Update configuration to work with current modules."