Merge config updates (bug #3406)

.cleancount

Makefile

apps/app_alarmreceiver.c

apps/app_directory.c

apps/app_enumlookup.c

apps/app_festival.c

apps/app_meetme.c

apps/app_privacy.c

apps/app_queue.c

apps/app_realtime.c

apps/app_rpt.c

apps/app_txtcidname.c

apps/app_voicemail.c

asterisk.c

cdr/cdr_manager.c

cdr/cdr_odbc.c

cdr/cdr_pgsql.c

cdr/cdr_tds.c

channels/chan_agent.c

channels/chan_alsa.c