Port uri-cp improvements
Update to handle updated init script
Merge tag 'upstream/0.0.22'
releasing package domtrix version 0.0.22-0ubuntu1