[blivet:master 0/7] rhbz#1070095 related patches (v2)