[blivet:rhel7/f21/master] #1151129 patch