Rebase to latest upstream commit (184c95029e) Resolves:rhbz2166859 Resolves:rhbz2173858 Signed-off-by: Tao Liu <ltao@redhat.com>