Sync internal

There have been a couple things that needed to be done differently internally (or snuck in) and this brings us mostly into sync. cc @sebmarkbage 

Side note: I'm doing this with a PR instead of just pushing because I want to try a thing where we can just run down a list of PRs when generating changelogs.