minor bug fix in old stress testing script
 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1680
 - fix conflict
Merge branch 'master' into merge-into-refactor-voice-users