Fixing tenant name issues for iOS
Merge branches 'milestone6' and 'milestone6' of github.com:WSO2Mobile/mdm into milestone6