Trunk tracking update for up to r3646

This gets us very close to being able to do SSL: OpenSSL and 
Serf + Serf fetcher are now linked in. Note that the docs need to
be updated to no disable HTTPS in PSOL build; but it looks like
I can't include that atomically.