Changed ONIX-PL licence text numbering to use display number initially and fall back to element id
Fixed merge conflict with application.properties