Fineract-614:

Updating Global Configurations
Fixing some rebase conflicts

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java

@@ -45,6 +45,7 @@ import javax.persistence.Embedded;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
 import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;

fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/data/LoanProductData.java

@@ -743,7 +743,7 @@ public class LoanProductData implements Serializable {
                            final List<EnumOptionData> rescheduleStrategyTypeOptions, final List<EnumOptionData> interestRecalculationFrequencyTypeOptions,
                            final List<EnumOptionData> preCloseInterestCalculationStrategyOptions, final List<FloatingRateData> floatingRateOptions,
                            final List<EnumOptionData> interestRecalculationNthDayTypeOptions,
-                           final List<EnumOptionData> interestRecalculationDayOfWeekTypeOptions) {
+                           final List<EnumOptionData> interestRecalculationDayOfWeekTypeOptions, final boolean isRatesEnabled) {
         this.id = productData.id;
         this.name = productData.name;
         this.shortName = productData.shortName;