openconnect formula changes

Let me know if you want me to rebase these commits so they're not dependent upon one another. See individual commit messages for details.