Merge remote branch 'origin/master' into poll-access

1

bbb-api-demo/src/main/webapp/bbb_api.jsp

bbb-video/.classpath

bbb-video/build.gradle

...in/java/org/bigbluebutton/app/video/VideoApplication.java

bbb-video/src/main/webapp/WEB-INF/red5-web.xml

bbb-voice/build.gradle

...in/java/org/bigbluebutton/voiceconf/red5/Application.java

...a/org/bigbluebutton/voiceconf/red5/CallStreamFactory.java

...bluebutton/voiceconf/red5/media/AudioBroadcastStream.java

...va/org/bigbluebutton/voiceconf/red5/media/CallStream.java

...luebutton/voiceconf/red5/media/FlashToSipAudioStream.java

...luebutton/voiceconf/red5/media/SipToFlashAudioStream.java

.../main/java/org/bigbluebutton/voiceconf/sip/CallAgent.java

...n/java/org/bigbluebutton/voiceconf/sip/ScopeProvider.java

...rc/main/java/org/bigbluebutton/voiceconf/sip/SipPeer.java

.../java/org/bigbluebutton/voiceconf/sip/SipPeerManager.java

bbb-voice/src/main/java/org/red5/app/sip/AudioStream.java

bbb-voice/src/main/java/org/red5/app/sip/CallStream.java

.../java/org/red5/app/sip/ConnectionClientMethodInvoker.java