Rebase with trunk

Signed-off-by: Dan Lambright <dlambrig@redhat.com>