7.1.x

Creating a new branch for maintenance and adding support for turning websockets on