tenant deletion updates

Change-Id: Ibd1206530460b86e4573ead06c635b9e13f63378
Merge "tenant deletion updates"