The first commit is a bug fix. The rest are a bunch of useful fixes, i.e., keepers from a separate branch that made me notice the bug in the first place. -- To view this pull request on github, visit https://github.com/rhinstaller/blivet/pull/123