Merge #3408: licenses: prefer spdx.org, improve docs

The patch to allow using license shortnames as attributes
was not included (yet).

Conflicts (auto-solved):
	pkgs/development/libraries/libtiff/default.nix