Merge branch 'ljackson-master' into merging-fs-support

bbb-video/vm-build.sh

bbb-voice-conference/config/freeswitch/README

...config/freeswitch/conf.orig/autoload_configs/acl.conf.xml

...ig/freeswitch/conf.orig/autoload_configs/cdr_csv.conf.xml

...freeswitch/conf.orig/autoload_configs/cdr_pg_csv.conf.xml

.../freeswitch/conf.orig/autoload_configs/cidlookup.conf.xml

...freeswitch/conf.orig/autoload_configs/conference.conf.xml

...ig/freeswitch/conf.orig/autoload_configs/console.conf.xml

...ch/conf.orig/autoload_configs/dialplan_directory.conf.xml

.../freeswitch/conf.orig/autoload_configs/dingaling.conf.xml

.../freeswitch/conf.orig/autoload_configs/directory.conf.xml

...reeswitch/conf.orig/autoload_configs/distributor.conf.xml

.../freeswitch/conf.orig/autoload_configs/easyroute.conf.xml

...onfig/freeswitch/conf.orig/autoload_configs/enum.conf.xml

...eeswitch/conf.orig/autoload_configs/erlang_event.conf.xml

...witch/conf.orig/autoload_configs/event_multicast.conf.xml

...eeswitch/conf.orig/autoload_configs/event_socket.conf.xml

...config/freeswitch/conf.orig/autoload_configs/fax.conf.xml

...onfig/freeswitch/conf.orig/autoload_configs/fifo.conf.xml

...config/freeswitch/conf.orig/autoload_configs/ivr.conf.xml