Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into improve-log-on-presentation-conversion