Include rpmvercmp in list of binaries used by testall.
(cherry picked from commit ff148ed88699731d054fdc0902a6efffffac4739)
Update Changelog.
(cherry picked from commit 41914dcc66357385f03a936737d6d62192267946)
Add client_history_timeout attribute to common hub control.

Redmine: #6669
(cherry picked from commit 621306d2ca8af2fddac7050cd62868c4ac9649be)
Merge remote-tracking branch 'upstream/3.6.x' into 3.6.x_surfsara