Lock websocket client connection, so clicking reconnect rapidly does not crash it
Fix lint issues
Merge branch 'master' into builds
7.150