Merged upstream/master.

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

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

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

bbb-lti/grails-app/controllers/ToolController.groovy

bbb-lti/grails-app/services/BigbluebuttonService.groovy

bbb-lti/src/java/org/bigbluebutton/lti/Parameter.java

.../bigbluebutton/conference/service/voice/VoiceHandler.java

.../bigbluebutton/webconference/voice/ConferenceService.java

...button/webconference/voice/ConferenceServiceProvider.java

...va/org/bigbluebutton/webconference/voice/Participant.java

...main/java/org/bigbluebutton/webconference/voice/Room.java

...ton/webconference/voice/freeswitch/ConnectionManager.java

...tton/webconference/voice/freeswitch/ESLEventListener.java

...webconference/voice/freeswitch/FreeswitchApplication.java

...ton/webconference/voice/freeswitch/FreeswitchMeeting.java

...on/webconference/voice/freeswitch/FreeswitchMeetings.java

...onference/voice/freeswitch/FreeswitchServiceProvider.java

...ference/voice/freeswitch/actions/PopulateRoomCommand.java

...uebutton/webconference/voice/internal/ParticipantImp.java

...g/bigbluebutton/webconference/voice/internal/RoomImp.java