We were missing mod_smpp; mod_json_cdr needed to be placed differently
in the file such that it matches the output of the automated generator
we use to check the completeness of this file.

FS-9086 #resolve [Video files playing in mod_conference do not count in totals for calculating layout]

Revert "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."

This reverts commit c39fbb29.

Merge pull request #825 in FS/freeswitch from ~SSINYAGIN/freeswitch:bugfix/FS-9075-debian-package-freeswitch-all-incompatible to master

* commit 'ce6af250':
  FS-9075 fixup for systemd and sysvinit

Merge pull request #822 in FS/freeswitch from bugfix/FS-9060-re-invite-with-bypass_media_after_bridge to master

* commit '0a8e115b':
  FS-9060: [mod_sofia] correct issues with hold and broken soa negotiations after performing a bypass media reinvite

Merge pull request #821 in FS/freeswitch from ~BKUHLS/freeswitch:bugfix/FS-9093-mod_cv-remove-unneeded-headers to master

* commit 'b024c752':
  FS-9093: mod_cv: remove unneeded includes

OpenCV contains various modules which have inter-module dependencies.
While including freeswitch into buildroot we stumbled over the fact
that mod_cv.cpp includes more headers than needed[1].
hese OpenCV headers are generic headers which require more OpenCV
modules enabled than really used by Freeswitch.
This patch fixes the problem.

[1] http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/146662Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

FS-9060: [mod_sofia] correct issues with hold and broken soa negotiations after performing a bypass media reinvite

Merge pull request #819 in FS/freeswitch from ~PIOTRGREGOR/freeswitch:feature/FS-9085-avmd-add-avmd_fire_event-method to master

* commit 'bfd8ef08':
  FS-9085, FS-9024: [avmd] Add events
  FS-9024: [avmd] Add events

Add start/stop events. Add registration
method, add fire events method.

FS-9057 #resolve [Screen Share feed no longer takes floor when someone mutes and unmutes their webcam]

Add sesion start/stop events.

Merge pull request #815 in FS/freeswitch from ~ALEXANDR.DUBOVIKOV_GMAIL.COM/freeswitch:feature/FS-9078-hepv2-and-hepv3-support-windows-pragma to master

* commit '024af441':
  one push one pop
  FS-9078 added #pragma for MSVC compiler

FS-9082: [mod_java] coreectly reference the modules dir so mod_java can load what it needs when modules are not placed in prefix/mod directory

* commit '252f0e26':
  FS-9083 [mod-sofia] Pass On SIP headers from leg A to B

Buffer overflow in switch_channel_expand_variables_check and switch_event_expand_headers_check fixed (FS-8757)