Rebase to latest upstream 2.2.0
    
    This is the latest rebase to match upstream version 2.2.0.
    
    See also re-review request: BZ#1758293
    See also Pagure unretire/unorphan request: https://pagure.io/releng/issue/8859
    
    Signed-off-by: Dinesh Prasanth M K <dmoluguw@redhat.com>