Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5

* 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