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