Change locale handling from 60-setup-locale to 61-puavo-setup-locale
and make it based on /etc/puavo/device.json.
Merge remote-tracking branch 'origin/master' into trusty