chore: Carry forward BBB 3.0 fixes to 3.1#803

antobinary merged 2 commits intov3.1.x-releasebigbluebutton/bbb-install:v3.1.x-releasefrom

oct16-mergebigbluebutton/bbb-install:oct16-mergeCopy head branch name to clipboard