Merge pull request #656 in FS/freeswitch from mod_conf_enhancements to master

* commit 'c39fbb295f6b9bc01baa5dbfc578e12022c088ae':
  FS-8704: Add min-members, wait-min-members-timeout, wait-mod-timeout, wait-min-members-timeout-message, wait-mod-timeout-message, endconf-mod-exit-message, and endconf-message parameters and functionality to mod_conference.

diff --cc src/mod/applications/mod_conference/conference_api.c
Simple merge

diff --cc src/mod/applications/mod_conference/conference_loop.c
Simple merge

diff --cc src/mod/applications/mod_conference/conference_member.c
Simple merge

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

diff --cc src/mod/applications/mod_conference/mod_conference.h
Simple merge