Added option -multitenant. Now multitenancy is in effect only when the -multitenant option is used