feature #2989: Fix merge of 2989
feature #2989: Fix merge of 2989

goberle/one,alvarosimon/one,alvarosimon/one,ohamada/one,hsanjuan/one,baby-gnu/one,dberzano/opennebula-torino,atodorov-storpool/one,mattthias/one,spirit03/one,ggalancs/one,fasrc/one,juanmont/one,OpenNebula/one,Terradue/one,cloudweavers/one,hsanjuan/one,OpenNebula/one,alvarosimon/one,Terradue/one,spirit03/one,cloudweavers/one,tuxmea/one,atodorov-storpool/one,unistra/one,fasrc/one,hsanjuan/one,goberle/one,unistra/one,tuxmea/one,atodorov-storpool/one,tuxmea/one,abelCoronado93/one,ohamada/one,unistra/one,OpenNebula/one,juanmont/one,juanmont/one,ggalancs/one,spirit03/one,baby-gnu/one,abelCoronado93/one,dberzano/opennebula-torino,OpenNebula/one,atodorov-storpool/one,abelCoronado93/one,fasrc/one,hsanjuan/one,alvarosimon/one,goberle/one,baby-gnu/one,dberzano/opennebula-torino,mattthias/one,fasrc/one,baby-gnu/one,Terradue/one,spirit03/one,baby-gnu/one,OpenNebula/one,abelCoronado93/one,abelCoronado93/one,cloudweavers/one,spirit03/one,OpenNebula/one,baby-gnu/one,ggalancs/one,juanmont/one,Terradue/one,ohamada/one,ohamada/one,hsanjuan/one,ggalancs/one,juanmont/one,tuxmea/one,hsanjuan/one,juanmont/one,atodorov-storpool/one,unistra/one,atodorov-storpool/one,atodorov-storpool/one,ggalancs/one,dberzano/opennebula-torino,mattthias/one,spirit03/one,spirit03/one,tuxmea/one,mattthias/one,hsanjuan/one,mattthias/one,mattthias/one,hsanjuan/one,alvarosimon/one,unistra/one,tuxmea/one,cloudweavers/one,alvarosimon/one,tuxmea/one,cloudweavers/one,fasrc/one,Terradue/one,goberle/one,abelCoronado93/one,juanmont/one,juanmont/one,ohamada/one,Terradue/one,dberzano/opennebula-torino,dberzano/opennebula-torino,fasrc/one,cloudweavers/one,goberle/one,unistra/one,goberle/one,ohamada/one,unistra/one,unistra/one,abelCoronado93/one,goberle/one,juanmont/one,ggalancs/one,tuxmea/one,alvarosimon/one,Terradue/one,Terradue/one,ohamada/one,baby-gnu/one,cloudweavers/one,mattthias/one,cloudweavers/one,atodorov-storpool/one,abelCoronado93/one,fasrc/one,OpenNebula/one,alvarosimon/one,atodorov-storpool/one,baby-gnu/one,mattthias/one,goberle/one,ggalancs/one,OpenNebula/one,fasrc/one,OpenNebula/one,ohamada/one,ggalancs/one,spirit03/one,dberzano/opennebula-torino