Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into oct16-merge

...rc/main/scala/org/bigbluebutton/SystemConfiguration.scala

...n/scala/org/bigbluebutton/core/apps/PermissionCheck.scala

akka-bbb-apps/src/universal/conf/application.conf

...b/src/main/java/org/bigbluebutton/api/MeetingService.java

...b/src/main/java/org/bigbluebutton/api/domain/Meeting.java

...-web/src/main/java/org/bigbluebutton/api/domain/User.java

...button/presentation/imp/OfficeToPdfConversionService.java

...gbluebutton/web/services/EnteredUserCleanupTimerTask.java

.../org/bigbluebutton/web/services/UserCleanupTimerTask.java

bigbluebutton-html5/client/main.html

bigbluebutton-html5/imports/api/annotations/addAnnotation.js

...uebutton-html5/imports/api/audio/client/bridge/kurento.js

bigbluebutton-html5/imports/api/audio/client/bridge/sip.js

...n-html5/imports/api/meetings/server/methods/endMeeting.js

...ton-html5/imports/api/polls/server/methods/publishVote.js

...l5/imports/api/users/server/handlers/validateAuthToken.js

...ton-html5/imports/api/users/server/methods/userLeaving.js

...ml5/imports/api/users/server/methods/validateAuthToken.js

bigbluebutton-html5/imports/startup/client/base.jsx

bigbluebutton-html5/imports/startup/client/logger.js