F #5722: Revert changes to oned.conf made during merge
F #5722: Revert changes to oned.conf made during merge

OpenNebula/one,OpenNebula/one,OpenNebula/one,OpenNebula/one,OpenNebula/one,OpenNebula/one,OpenNebula/one,OpenNebula/one,OpenNebula/one