Feature #1303: Small improvements to marketplace plugin
Feature #1303: Small improvements to marketplace plugin

Limit context of some selectors, clearup custom variables before adding new ones...
(cherry picked from commit 6c66b1d9fda668b7f63580c2be7122e53c30e1f6)

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