Recover 2.3-alpha3 version of bbb-conf

Most of the changes date back to #10700 
We were trying to trace down a problematic change likely when merging 2.2.31 into 2.3 ( #11033 )
If anyone spots issues with bbb-conf on their 2.3 server, please comment