cluster: RHEL54 - Merge branch 'RHEL54' of git://git.fedorahosted.org/cluster into my54