user_name field added on the opentenure.claimant table
merging conflicts
SQL generating scripts changed to accommodate opentenure schema