Fix for 1374104 - renew multi-tenancy auth token upon expiry

Change-Id: I9de08f8ba72905a9e441c9aa0f82fd9238a2493b
Merge "Fix for 1374104 - renew multi-tenancy auth token upon expiry"