Rebase to latest upstream commit (167580790c) Resolves:rhbz2106288 Resolves:rhbz2106997 Signed-off-by: Tao Liu <ltao@redhat.com>