Fix wget timeout in RHN satellite key download
[PRD-930] Use AMQP heartbeat for mcollective
modifyed OCF scripts

port from 3.2.1