Resolves: rhbz#1983310 Additionally, clean up unused duplicate patch to remove btrfs plugin. Signed-off-by: Neal Gompa <ngompa@centosproject.org>