Merge branch 'master' into smgmaster

Conflicts:
	build/modules.conf.in

diff --cc libs/esl/fs_cli.c
Simple merge

diff --cc src/include/switch_apr.h
Simple merge

diff --cc src/mod/applications/mod_commands/mod_commands.c
Simple merge

diff --cc src/mod/endpoints/mod_sofia/mod_sofia.c
Simple merge

diff --cc src/mod/endpoints/mod_sofia/mod_sofia.h
Simple merge

diff --cc src/switch_apr.c
Simple merge

diff --cc src/switch_console.c
Simple merge

diff --cc src/switch_core.c
Simple merge