Resolves: bz821717 (f17) bz821718 (f16) bz821719 (f15) Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>