quic feature branch rebase

[nhorman]

need to pick up some changes from master to better allow building of interop tests for quic-server feature branch

Task is pretty straightforward, just rebase the feature branch and post for review so it can be force pushed. There are some minor conflicts but nothing to complex yet, so its a good time to get it done