F #2830: Fix merge of PR #3113
F #2830: Fix merge of PR #3113

atodorov-storpool/one,OpenNebula/one,baby-gnu/one,atodorov-storpool/one,OpenNebula/one,atodorov-storpool/one,baby-gnu/one,baby-gnu/one,atodorov-storpool/one,baby-gnu/one,OpenNebula/one,OpenNebula/one,atodorov-storpool/one,atodorov-storpool/one,atodorov-storpool/one,OpenNebula/one,baby-gnu/one,baby-gnu/one,baby-gnu/one,baby-gnu/one,OpenNebula/one,atodorov-storpool/one,OpenNebula/one,atodorov-storpool/one,OpenNebula/one,OpenNebula/one