minor bug fix in old stress testing script
 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1680
Changing lables for 0.81
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
Minor update to bbb-conf
Merge remote-tracking branch 'upstream/master'