[Bug 1343661] Rebase clufter component [RHEL 7.3]