fix for STRATOS-851
Code review changes
Merge branch 'tenant-isolation-feature_wip' of https://github.com/lasinducharith/stratos

This closes #76
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/stratos