Added new method for LocationDAO.getByNameCountryAndType(...)
fix for the new location method
GCP-5608
Merge branches 'master' and 'master' of https://github.com/digitalabs/IBPMiddleware
Merge branch 'master' of https://github.com/digitalabs/IBPMiddleware
GCP-5607 created Service, DataImportService, DataImportServiceImpl, TestDataImportServiceImpl classes
Merge branch 'master' of https://github.com/digitalabs/IBPMiddleware
Merge branch 'master' of https://github.com/digitalabs/IBPMiddleware