Change ip addresses of collar{0,1}
Fix ip addresses for collar{0,1}
Correct dhcp range.
Replace sonar with sonarqube.

Sonar has been deprecated as a project.
Autopep8 lick.
Tidy deploy.
Lick: add docstrings.
Make lick parallel.

It runs faster now.
Merge jenkins:/etc/puppet
Merge branch 'master' of github.com:ucam-cl-dtg/dtg-puppet