feature #1691: Fix error during merge
feature #1691: Fix error during merge

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