Start work on 331.89-0ubuntu3
debian/71-nvidia.rules: tag devices for logind and handle nvidia-persistenced

This also gets rid of the upstart job for nvidia-persistenced.
Refresh files from templates
Release 331.89-0ubuntu3
Start work on 331.89-0ubuntu4
debian/71-nvidia.rules: make the rule more generic

Conflicts:
	debian/71-nvidia.rules
debian/templates/control.in: integrate more changes by Graham Inggs

Drop the recommends on #LIBOPENCL1#, as #OPENCLICD# has its own
dependencies

Add a recommends on #DRIVERUVMNAME# and remove the suggests.

Create two new virtual packages 'nvidia-opencl-icd' and
'nvidia-uvm' which prevent these packages from overwriting each
other's files (should fix #1328762 and #1347926).
Refresh files from templates
Release 331.89-0ubuntu4