Resolve conflicts with master, removed regParam for LogisticRegression