95e3ce4
Pull in some lost changes from RHEL 7.0 branch to merge more easily. Signed-off-by: Peter Jones <pjones@redhat.com>