B #4837: search zone variable with both _ and -
B #4837: search zone variable with both _ and -

(cherry picked from commit 2fa37a6a5289305a20e0c73f27594a56c62187d7)

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