Combine triggers to properly handle upgrade (#699198)
    
    From https://bugzilla.redhat.com/show_bug.cgi?id=702378#c2:
    
    This is the intended and expected behavior (from rpm POV): only a single
    trigger is executed per each trigger target <-> source pair in a transaction.
    
    By combining them, the right thing should happen.