Merge forecast-gridweather-option-vipsutv-610, fix conflicts

pom.xml

...c/controller/servlet/ForecastConfigurationController.java

.../no/nibio/vips/logic/controller/session/ForecastBean.java

...ips/logic/controller/session/SessionControllerGetter.java

...ava/no/nibio/vips/logic/entity/ForecastConfiguration.java

src/main/java/no/nibio/web/forms/FormValidator.java

src/main/resources/db/migration/V18__UseGridWeatherData.sql

...ources/no/nibio/vips/logic/i18n/vipslogictexts.properties

...ces/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties

...ces/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties

...ces/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties

...ces/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties

.../no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties

...ain/webapp/formdefinitions/forecastConfigurationForm.json

src/main/webapp/js/validateForm.js

src/main/webapp/templates/forecastConfigurationForm.ftl