DROP COLUMN from tipp. Restrict Licence consortia screen to template licences.
Merge branch '4.2-dev' into newdev