Merge branch 'rh/test-color-avoid-terminfo-in-original-home' into maint