[Bug 1269964] Rebase clufter component [RHEL 6.8]