added multi tenancy and different compute template handling
Merge remote-tracking branch 'origin/master'