Merge pull request #2711 from jow-/openconnect-nolz4