More licence fixes 1.20

This is required for compliance with the licensing rules to allow Juju to be included in trusty