Merge branch 'smgmaster' into releases.3.4

Conflicts:
	libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
	libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c

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

diff --cc src/switch.c
index 49ca107f6793d4abe2dfbaaf7d5655aad697f189,3abe85b5fb68134af692d3b949855369239fa6ea..c0f4b5c2d3f659dc46d6797b8404076126fa1ff9
--- 1/src/switch.c
--- 2/src/switch.c
+++ b/src/switch.c
@@@ -875,10 -892,13 +892,15 @@@ int main(int argc, char *argv[]
  
        apr_pool_create(&pool, NULL);
  
 +      switch_filepath_set(SWITCH_GLOBAL_dirs.base_dir, pool);
 +
        switch_dir_make_recursive(SWITCH_GLOBAL_dirs.run_dir, SWITCH_DEFAULT_DIR_PERMS, pool);
  
+       if (switch_core_init_and_modload(flags, nc ? SWITCH_FALSE : SWITCH_TRUE, &err) != SWITCH_STATUS_SUCCESS) {
+               fprintf(stderr, "Failed to initialize modules: %s\n", err);
+               return 1;
+       }
+ 
        if (switch_file_open(&fd, pid_path, SWITCH_FOPEN_READ, SWITCH_FPROT_UREAD | SWITCH_FPROT_UWRITE, pool) == SWITCH_STATUS_SUCCESS) {
  
                old_pid_len = sizeof(old_pid_buffer);

diff --cc src/switch_apr.c
Simple merge