2d872d9 Merge branch 'orphan-management'

Merged and Committed by ralph 6 years ago
    Merge branch 'orphan-management'
    
    Signed-off-by: Ralph Bean <rbean@redhat.com>