Bring up-to-date with recent work and after screwing up git.
Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>