UP-3941:  Refactor responsibility for instantiating a JpaTenant to the JpaTenantDao;  merge create/update methods on the DAO