This just backports and squashes together some commits from master, specifically: [anaconda] 69484b44 823ad562 b65c9247 4e3a8082 5821956a 674f596c [initial-setup] 1276f37c Things are pretty much the same as when these were first reviewed, but I figured I'd post them again since the changes touch a lot of files.