Conflicts:
	build/next-release.txt

Merge pull request #150 in FS/freeswitch from ~ITALOROSSI/freeswitch:FS-7126-fix_mod_translate_var_expansion_without_session to master

* commit 'e4f22c82':
  https://freeswitch.org/jira/browse/FS-7126 fix variable expansion in translate api when there is no session involved.

FS-7314 #resolve #comment try to fix openssl configure detection failure caused by broken commit upstream in openssl 1.0.2.  I don't have a box with this version of openssl so you'll need to let me know if this doesn't work

https://freeswitch.org/jira/browse/FS-7126 fix variable expansion in translate api when there is no session involved.

Merge pull request #196 in FS/freeswitch from ~ARTURZ/freeswitch:FS-7304-dialplan-reversed-ranges to master

* commit '2d074488':
  FS-7304: Multiple and reversed ranges for XML dialplan date and time conditions

Merge pull request #200 in FS/freeswitch from ~SJTHOMASON/freeswitch:bugfix/FS-7192-expires-header-included-in-gateway to master

* commit '54f16398':
  FS-7192: [mod_sofia] do not include Expires header in INVITEs responding to a auth challenge

Merge pull request #201 in FS/freeswitch from ~SJTHOMASON/freeswitch:bugfix/FS-7308-cannot-disable-sofia-sla-sql-query to master

* commit 'cc61f11f':
  FS-7308: [mod_sofia] Only log SLA SQL query SQL when debugging is enabled

Merge pull request #203 in FS/freeswitch from ~MISHEHU/freeswitch:bugfix/FS-7302-fs_encode-improvements-for-config to master

* commit 'ed2fabc2':
  FS-7302: Added params to fs_encode.c:          -c for path to conf_dir          -k for path to log_dir          -m for path to mod_dir

Merge pull request #202 in FS/freeswitch from ~SJTHOMASON/freeswitch:feature/FS-7309-allow-removal-of-user-agent-header to master

* commit '74e8db73':
  FS-7309: [mod_sofia] Allow removal of User-Agent header

Merge pull request #195 in FS/freeswitch from ~ARTURZ/freeswitch:FS-7299-mod_xml_cdr-cookie-file to master

* commit 'e2660570':
  FS-7299: Implement cookie-file option for mod_xml_cdr.

Merge pull request #182 in FS/freeswitch from ~CXREG/freeswitch-memcache-file:eavesdrop_bridge_single_leg to master

* commit '2890afc9':
  FS-7285 allow eavesdrop to bridge only one leg

Merge pull request #181 in FS/freeswitch from ~CXREG/freeswitch-memcache-file:base_alt_dir to master

* commit 'ded03004':
  FS-7284 allow -base to satisfy "You must specify all or none of -conf, -log, and -db"

In certain deployments it might be desirable to remove the User-Agent header from the SIP message.
Set the sofia profile parameter "user-agent-string" to "none" to suppress this header.

         -c for path to conf_dir
         -k for path to log_dir
         -m for path to mod_dir

FS-7301 #comment set the tx-reinvite-packet-count to 400, seems we are too fast for the remote in this case which is causing your failure #resolve

Merge pull request #194 in FS/freeswitch from ~ARTURZ/freeswitch:FS-7298-race-condition-when-callcenter-member to master

* commit '0df4085c':
  Fix race condition when callcenter member cancels the call.

FS-7066 FS-7253 FS-7231 #comment wait, there's more.... need this too, let's never change this code again....

* commit '23b10d5d':
  Get ordering of dates in Spanish right (dd-mm-yyyy)