Fixed error with ONIX-PL comparison tool when usage terms don't have licence texts associated
Fixed merge conflict with application.properties