BISERVER-8752 - Update the default user and tenant creation