* upstream/master: (22 commits)
  - create only one netConnection to bbb-apps. Not re-create one when reconnecting.
  - log client out when user is ejected from meeting.
  - reset connectAttemptTimeout as we don't want to fail connection on reconnects.
  - fix rtmpt
  - add more logging to track issues
  Update Gemfile.lock for 1.1-dev
  - log locale version
  - remove user join log
  improve logs for webrtc events
  - improve client side logging.
  add EN string to ClientStatusEvent
  Updated restart of libreoffice for systemd
  - add log to indicate successful connection to bbb-apss
  bbb-web: Escaped strings used in freemarker template for thumbnails
  record-and-playback: Removed preview extension (thumbnails) from recordings when only has default presentation
  Fix import in stunturn reply handler
  Fix handleStunTurnReply function name
  Clean up before PR
  Rever wrong changes on chat handler parameters
  Revert wrong changes on chat handler name
  ...

 - create only one netConnection to bbb-apps. Not re-create one when …

 - log client out when user is ejected from meeting.

 - reset connectAttemptTimeout as we don't want to fail connection on…

RnP: Improve error handling in video_info, audio_info functions

 - fix rtmpt

 - add more logging to track issues

Update Gemfile.lock for 1.1-dev

 - log locale version

 - remove user join log

Add an i18n agnostic field for client logging

 - improve client side logging.

Updated restart of libreoffice for systemd

 - add log to indicate successful connection to bbb-apps

bbb-web: Escaped strings used in freemarker template for thumbnails

record-and-playback: No thumbnails for default presentation

record-and-playback: Removed preview extension (thumbnails) from recordings when only has default presentation

[HTML5] Refactor of Meetings API

* upstream/master:
  Update config.xml.template
  Remove /tmp/tmp.XXXXXXXX file created by bbb-record
  remove some unnecessary logging
  Fixed stream to streams
  - updating latest locales except for zh_TW as it's failing to compile.
  Move client breakout rooms configuration to a new node and added a new option to enable/disbale recordings for breakout rooms.
  record-and-playback: Encoded text coming from the slide for being used in thumbnails
  Format line in bbb-conf using spaces.
  bbb-conf stops and starts redis server & checks video and freeswitch recordings directories

Added flag to config.xml to enable/disable the visibility of the Record option

Remove /tmp/tmp.XXXXXXXX file created by bbb-record