[blivet:master 00/11] rhbz#1070095 related patches (v3)