predef multi tenant fix, support for demo user.
change names in market_place addons