BISERVER-8752 - Updating to default user and tenant creation logic