Fix for bug 1414, bug 1435 & bug 1438 - Multi-tenancy with keystone as backend

Change-Id: Ifd154f5ddb75897209c2281c96087840432fb110
Signed-off-by: palsus <subhankar.pal@aricent.com>
(cherry picked from commit 0ab6407f)