Merge branches 'master' and 's21_success_for_retry' of https://github.com/cegeka/batchers into s21_success_for_retry

Conflicts:
	taxcalculator/taxcalculator-batch/src/main/java/be/cegeka/batchers/taxcalculator/batch/service/TaxCalculatorJobService.java