Fix B4897. Clean up
Fix B4897. Clean up

abelCoronado93/one,atodorov-storpool/one,ohamada/one,goberle/one,juanmont/one,OpenNebula/one,juanmont/one,abelCoronado93/one,baby-gnu/one,goberle/one,unistra/one,unistra/one,baby-gnu/one,abelCoronado93/one,ohamada/one,OpenNebula/one,baby-gnu/one,goberle/one,ohamada/one,unistra/one,atodorov-storpool/one,OpenNebula/one,OpenNebula/one,goberle/one,goberle/one,atodorov-storpool/one,unistra/one,ohamada/one,abelCoronado93/one,juanmont/one,abelCoronado93/one,atodorov-storpool/one,baby-gnu/one,atodorov-storpool/one,goberle/one,atodorov-storpool/one,abelCoronado93/one,unistra/one,juanmont/one,baby-gnu/one,juanmont/one,ohamada/one,OpenNebula/one,goberle/one,atodorov-storpool/one,juanmont/one,unistra/one,atodorov-storpool/one,ohamada/one,atodorov-storpool/one,unistra/one,baby-gnu/one,OpenNebula/one,abelCoronado93/one,baby-gnu/one,unistra/one,OpenNebula/one,OpenNebula/one,ohamada/one,OpenNebula/one,abelCoronado93/one,juanmont/one,ohamada/one,goberle/one,baby-gnu/one,juanmont/one,juanmont/one