Fix ONIX-PL import which was apparently messed up by a merge.
Commit irritating application.properties
#565 After OPL import, provide link to KB+ licence rather than OPL.
Merge newdev into onixpl
Merge fresh newdev into onixpl
Resolve merge conflict